From f0311a6f5ee249452ad0c62c5a92b109fd68a97e Mon Sep 17 00:00:00 2001
From: Theodore Li <theo@sim.ai>
Date: Wed, 20 May 2026 02:44:09 -0700
Subject: [PATCH 01/16] feat(table): chunked dispatcher + workflow cascade
 (#4672)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(table): chunked dispatcher for workflow-column runs

Replaces the all-rows-at-once runWorkflowColumn with a row-window dispatcher
backed by a new table_run_dispatches row. Each user click inserts a dispatch
row and triggers a trigger.dev task that crawls the table 20 rows at a time,
re-enqueueing itself between windows. The HTTP/Mothership entrypoints return
{ dispatchId } immediately instead of holding the request open for minutes
on multi-thousand-row dispatches.

- Per-row cancel stamps cancelledAt; the dispatcher skips cells whose
  cancelledAt > dispatch.requestedAt so a mid-cascade cancel sticks even
  under isManualRun.
- Table-wide cancel marks active dispatches cancelled atomically so the
  dispatcher bails on its next iteration.
- New 'dispatch' SSE event variant plumbed; client ignores for v1.

* fix(table): eager bulk clear on column run so cells flip immediately

Run-column with run-mode 'all' wasn't visually flipping rows that already
had data — the cell renderer's "value wins" branch kept showing the prior
output behind the queued/running state. The dispatcher only cleared one
window of rows at a time, so most of the column stayed stale until the
cursor walked to it.

Now:
- Dispatcher's `pending → dispatching` transition runs a single SQL UPDATE
  that wipes targeted `data` output columns and `executions[gid]` across
  every targeted row (mode-aware: 'incomplete' skips fully-filled rows).
- Per-window clear in `dispatcherStep` is gone — rows are pre-cleared,
  the loop only filters cancel tombstones / unmet deps and enqueues.
- Optimistic patch in `useRunColumn` mirrors the bulk clear by nulling
  output values in the cached row, so the UI flips queued/running
  instantly without waiting for the SSE catch-up.

* fix(table): bulk clear honors in-flight execs under mode: 'incomplete'

The eager bulk clear for mode: 'incomplete' only skipped rows that were
already fully filled, so two overlapping dispatches could race — dispatch B
would nuke executions[gid] on a row dispatch A had just stamped 'queued',
flickering the cell and potentially confusing the worker.

Skip any row whose targeted group is currently queued/running/pending — an
'incomplete' run shouldn't touch what another dispatch is actively working
on. The per-walk 'in-flight' eligibility skip already handles rows that
flip in-flight between the clear and the cursor reaching them.

* refactor(table): dispatcher uses batchTriggerAndWait + tag-based cancel

Switch the per-window cell fan-out from fire-and-forget tasks.trigger to
tasks.batchTriggerAndWait. The dispatcher is now a single long-lived
trigger.dev task that loops dispatcherStep until the table is exhausted;
trigger.dev CRIU-checkpoints the parent during each wait so we don't pay
compute while cells execute. Queue depth is bounded at WINDOW_SIZE per
dispatch — no more flooding trigger.dev with a million queued runs.

- dispatcher.ts builds payloads via the new shared buildPendingRuns helper
  and calls tasks.batchTriggerAndWait directly. Pre-stamps each cell to
  `queued` (jobId=null) so the UI flips instantly.
- table-run-dispatcher.ts is now a plain while-true loop. No
  RUN_BUDGET_MS, no self-re-enqueue, no cold-start tax per window.

Cancel:
- New cancelCellRunsByTags(tags) paginates runs.list + runs.cancel(id).
- cancelWorkflowGroupRuns fires the tag-sweep alongside the per-jobId
  queue.cancelJob path (preserved for auto-fire cells that have real
  jobIds from single tasks.trigger calls).
- Trigger.dev acks the cancel → batchTriggerAndWait resumes → dispatcher
  observes the dispatch-row cancel flag → exits.

Side fixes:
- getAsyncBackendType returns 'trigger-dev' whenever taskContext.isInsideTask
  is true, regardless of TRIGGER_DEV_ENABLED env. The preview/dev-sim
  worker silently routing cell jobs to DatabaseJobQueue (no poller) is
  fixed without any env config change.
- runWorkflowColumn skips the dispatcher entirely when trigger.dev is
  disabled, running cells inline via DatabaseJobQueue.runInline. HTTP
  response returns dispatchId: null in that mode.
- runColumnContract response schema updated to dispatchId.nullable().

* fix(table): show Stop button on optimistic-pending row cells

isExecInFlight required a jobId for `pending` status, gating it as "real
backend pending" vs "optimistic flag only." The row-gutter Stop button
keyed on this — so a freshly clicked Play sat as `pending` (no jobId) and
the user couldn't cancel it until the server-side `queued` stamp arrived
via SSE. With the dispatcher pre-batch stamping cells as `queued` (not
`pending`) and no per-cell jobIds under batchTriggerAndWait, the gap was
worse.

Drop the jobId requirement. `pending` now counts as in-flight everywhere.
Cancel writes `cancelled` to the cell exec authoritatively whether or not
a real trigger.dev run exists yet — cancelling an optimistic cell means
"don't run this," which is correct.

Also collapse isOptimisticInFlight into isExecInFlight since the two
helpers are now identical.

* refactor(table): loop-in-cell cascade + dispatcher-everywhere routing

Two coupled changes:

1. Cell-task runs the row's full cascade in-process. executeWorkflowGroupCellJob
   acquires a Redis lock per (tableId, rowId) with heartbeat (10s/30s TTL),
   then loops through eligible workflow groups for the row. One cell-task =
   one row's full cascade, not N. Resume worker holds the same lock and
   continues the cascade after a HITL resume. Shared withCascadeLock helper
   in lib/table/cascade-lock.ts.

2. Every cell-enqueue goes through the dispatcher. The implicit
   scheduleRunsForRows reactor in service.ts is removed — 8 callsites
   (insertRow, batchInsertRows, upsertRow, updateRowsByFilter,
   batchUpdateRows, addWorkflowGroup, updateWorkflowGroup) now fire
   runWorkflowColumn with mode: 'incomplete', isManualRun: false. HTTP
   routes that call updateRow directly also fire runWorkflowColumn
   afterwards. scheduleRunsForTable / scheduleRunsForRowIds deleted;
   scheduleRunsForRows demoted to private (only the TRIGGER_DEV_ENABLED=false
   fallback uses it). skipScheduler flag dropped from UpdateRowData /
   BatchUpdateByIdData — no longer meaningful since there's nothing implicit
   to suppress.

Plumbed isManualRun through the dispatch row (new is_manual_run column,
default true) so auto-fire callers honor autoRun: false and don't re-run
completed cells.

Stamp 'pending' (not 'queued', executionId: null) before
batchTriggerAndWait — cell-task writes its own 'queued' on lock acquire.

Small UI polish: row gutter Play button spacing, "Delete workflow" →
"Delete column" label, optimistic-pending cells now show Stop button
(isExecInFlight no longer requires jobId).

* fix(table): SQL cancellation guard allows worker to claim a null-execId cell

The dispatcher's pre-batch `pending` stamp leaves executionId unset so any
cell-task that wins the cascade lock can claim the cell. The cancellation-
guard SQL clause was rejecting these claims because it tested
`executions->gid IS NULL` (whole exec missing) but the pre-stamp leaves
the exec present with executionId=null.

Add a third carve-out: `executions->gid->>'executionId' IS NULL`. Now the
guard reads "write allowed if no exec exists, OR no executionId is set
yet, OR the executionId matches ours."

Symptom: every cell-task's first markWorkflowGroupPickedUp call would log
"SQL guard saw cancelled" and skip, leaving cells stuck at the dispatcher's
pending stamp.

* fix(table): dispatcher cursor starts at -1 so position 0 is included

The dispatcher's row-window SELECT is `position > cursor` for exclusive
lower-bound semantics. With cursor initialized to 0, position-0 rows were
never picked up — every dispatch silently skipped the table's first row.

Start cursor at -1 instead. First window's filter `position > -1` matches
position 0; subsequent iterations advance to `lastPosition` which then
correctly excludes already-processed rows.

* refactor(table): align optimistic UI with new dispatcher; sticky cancel via 'new' mode

Fix 0: new `DispatchMode = 'new'` for auto-fire callsites. Eligibility skips
rows with any prior `executions[gid]` entry — cancelled / errored / completed
cells stay sticky until a manual run. Dispatcher's windowed SELECT pushes
`NOT jsonb_exists_any(...)` to SQL so CSV imports into mostly-attempted
tables don't pay a per-window load+JS-filter. `batchInsertRows` drops its
`rowIds` payload (keeps dispatch scope tiny on big imports).

Fix A/B/D: client optimistic patches now mirror the backend's actual
invariants. `useCreateTableRow.onSuccess` stamps eligible groups via
`optimisticallyScheduleNewlyEligibleGroups` so newly-inserted rows show
`Queued` instantly. `useCancelTableRuns.onMutate` distinguishes optimistic-
only pending (`executionId == null` — strip silently) from real worker
claims (stamp cancelled; SSE will reconcile). Drop `onSettled` invalidation
on `useUpdateTableRow` / `useBatchUpdateTableRows` to kill the
delete-cell flicker.

Fix C: active-dispatches overlay. New `listActiveDispatches` helper,
contract, and `GET /api/table/[tableId]/dispatches` route. `kind:'dispatch'`
SSE events carry scope+cursor+mode on every transition. New
`useActiveDispatches` hook + `resolveCellExec` synthesize a virtual
`pending` exec for cells in an active dispatch's scope ahead of cursor —
queued indicators now survive page refresh during long Run-all dispatches.
`cancelWorkflowGroupRuns` emits `kind:'dispatch',status:'cancelled'`
events so the overlay clears without a refetch.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(table): unify trigger.dev and inline dispatcher paths

`runWorkflowColumn` now always inserts a `table_run_dispatches` row and
drives the dispatcher state machine. The trigger.dev / in-process branch
narrows to a single line: trigger.dev fires `tableRunDispatcherTask` (which
calls the new `runDispatcherToCompletion`), the inline path calls the same
helper fire-and-forget. Deletes `scheduleRunsForRows` and
`stampQueuedOrCancel` — the inline-fallback no longer duplicates window
walking, SSE emission, or cancel.

The dispatcher's window-execute call goes through `JobQueueBackend`:
- New `batchEnqueueAndWait` interface method.
- Trigger.dev impl wraps `tasks.batchTriggerAndWait` behind a
  `taskContext.isInsideTask` guard (clear error if called from outside a
  task).
- Database impl skips `async_jobs` entirely — `Promise.all` over
  `options.runner(payload, signal)` per item, with per-cell AbortControllers
  tracked by `cancelKey` for cancel.

`cancelInlineRun` moves to the interface as `cancelByKey` so
`cancelWorkflowGroupRuns` no longer reaches into the database backend.

Fix `mode: 'new'` SQL filter:
- `${array}::text[]` interpolated as a tuple-cast which Postgres rejected
  ("cannot cast type record to text[]") and every inline dispatch silently
  failed. Switched to `ARRAY[${sql.join(...)}]::text[]`.
- Predicate was `jsonb_exists_any` ("any one targeted group present"),
  which excluded rows that needed at least one group re-run after a
  downstream output was deleted. Switched to `jsonb_exists_all` — per-group
  JS eligibility handles the rest.

Cascade-loop workflowId bug: `runRowCascadeLoop` was not threading the new
group's `workflowId` when advancing across groups. The cell-task ran the
previous group's workflow against the next group's cell, terminating
`completed` with empty `accumulatedData`. Fixed by tracking
`currentWorkflowId` alongside `currentGroupId` / `currentExecutionId`.

Client optimistic-patch tightening:
- `useRunColumn.onMutate` mirrors server eligibility — skip cells with
  unmet deps so unmet rows don't flash Queued and get stuck (no SSE will
  arrive for cells the server skipped).
- `resolveCellExec` overlay synthesizes a virtual `pending` only when
  `areGroupDepsSatisfied` is true. Rows with unmet deps render Waiting,
  matching the dispatcher's actual behavior.

Cleanup from /simplify pass:
- Use `generateShortId(20)` instead of
  `generateId().replace(/-/g, '').slice(0, 20)`.
- Inline `batchEnqueueAndWait` no longer allocates synthetic ids
  (returned `string[]` is unused).
- Flattened the per-cell `tracked` array — only push entries that
  registered controllers, drop the null placeholders.
- Extracted `runDispatcherToCompletion` to share the loop between the
  trigger.dev wrapper and the in-process path.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(table): backend running counter, dep-aware retrigger, sidebar polish

Counter (Fix 1): top-right "X running" + per-row badge are now
backend-bootstrapped via a count on `user_table_rows.executions ->> 'status'
= 'running'` returned alongside active dispatches. SSE `kind: 'cell'` events
compute a delta from `prev → next` status to keep the cache live; cell
events for rows outside the loaded page slice trigger a run-state refetch.
On `pruned` we invalidate the cache. Counts only worker-claimed `running`
cells — optimistic queued/pending no longer inflate the badge, and rows
outside the loaded page slice are counted too.

Sidebar (Fix 2 + 3a): `Run after` no longer ticks every column by default
for new groups (empty list). Save is disabled with an inline error when
auto-run is on with zero deps. `edit-group` mode anchors the left-of-current
filter to the group's leftmost column, so a workflow can only depend on
columns to its left.

Reorder scrub (Fix 3b): `updateTableMetadata` walks the schema's workflow
groups when `columnOrder` is in the patch and drops any dep whose new
position lands at or after the group's leftmost column (uses the existing
`stripGroupDeps` helper). Metadata + schema updates land atomically.

Server returns ordered columns (Fix 3b cont'd): `getTableById` /
`listTables` now sort `schema.columns` by `metadata.columnOrder` before
returning, via a new `applyColumnOrderToSchema` helper. Every consumer
(grid, sidebar, copilot, mothership) gets one ordered list — the sidebar's
leftmost-group-column anchor now points at the right index.

Dep-aware retrigger (Fix 4): editing a value that a downstream workflow
depends on now re-runs that workflow.
- `deriveExecClearsForDataPatch` returns
  `{ executionsPatch, inFlightDownstreamGroups }`. Walks
  `schema.workflowGroups[].dependencies.columns` for every column in the
  patch, clears terminal-state downstream entries, and reports in-flight
  entries.
- `updateRow` calls `cancelWorkflowGroupRuns` + `runWorkflowColumn`
  (`mode: 'incomplete' + isManualRun: true`) for in-flight downstream
  groups, then always fires `runWorkflowColumn({ mode: 'new' })` for the
  cleared groups. Skips both when `executionsPatch` is provided by the
  caller — those are cell-task / cancel writes that would otherwise spawn
  a recursive flood of dispatches per partial-write.
- `cancelWorkflowGroupRuns(tableId, rowId, { groupIds? })` accepts a
  per-group filter so the cancel only touches the affected groups, not
  every in-flight cell on the row.
- `pickNextEligibleGroupForRow` now treats a dispatcher pre-stamp
  (`pending` + `executionId: null`) as claimable — the cascade-loop is the
  real owner. Without this, the dispatcher's pre-stamp of downstream
  groups made the cascade-loop see them as "in-flight" and skip them,
  stranding `pending` cells forever.
- `optimisticallyScheduleNewlyEligibleGroups` extends the cache patch to
  flip dep-touched groups to `pending` regardless of their current status,
  matching the server's cancel-then-rerun behavior.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(table): paused workflow cells route through executeResumeJob; render Pending + viewable

Three connected issues with workflows that pause mid-cell (e.g. wait blocks):

1. `/api/resume/poll` (the time-pause auto-resumer) called
   `PauseResumeManager.startResumeExecution` directly, bypassing
   `executeResumeJob` from `background/resume-execution.ts`. The wrapper is
   where the cell-context restoration + cascade-loop continuation lives —
   without it, the resumed workflow ran to completion but never wrote the
   terminal state back to the table cell. Cell stays `pending` forever
   even though the underlying execution finished.

   Fix: dynamically import `executeResumeJob` and use it for the
   `'starting'` branch. Same primitive the trigger.dev `resumeExecutionTask`
   wraps — calling it directly handles both trigger.dev-disabled local dev
   and trigger.dev-enabled prod identically.

2. The cell renderer mapped `status: 'pending'` to `kind: 'queued'` (gray
   "Queued" badge) regardless of whether the run had started. A HITL-paused
   run has `status: 'pending'` + `jobId` prefixed `paused-` + a real
   `executionId` — semantically very different from "queued, hasn't run."
   Now renders as `pending-upstream` (the existing Pending pill) for
   paused-jobId rows.

3. Right-click "View execution" was disabled for `pending` cells (gated to
   `completed | error | running`), so users couldn't open the trace for a
   paused execution. Paused runs have a viewable trace (the executionId is
   real and the log row exists). Both the per-row context menu and the
   action-bar derivation now recognize `pending` + `paused-` jobId as a
   started run.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(table): typewriter reveal for SSE-driven workflow cell values

Workflow-output cells now reveal their text character-by-character when an
SSE update lands, while page reloads and virtualization remounts still paint
the value instantly. A first-render guard inside the new useTypewriter hook
distinguishes hydration from live updates with no plumbing through the cell
tree.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(table): address bugbot/greptile review feedback

Two P1 issues + one cleanup from the bot reviewers:

1. **Double-dispatch + completed-output wipe.** Both PATCH row routes
   (`app/api/table/[tableId]/rows/[rowId]` and
   `app/api/v1/tables/[tableId]/rows/[rowId]`) were firing a second
   `runWorkflowColumn({ mode: 'incomplete' })` after `updateRow` returns.
   `updateRow` already fires `mode: 'new'` internally for user edits, so
   the second call created a concurrent dispatch. Worse, the
   `mode: 'incomplete'` path's `bulkClearWorkflowGroupCells` wipes ALL
   targeted output columns on any row where any one column is empty —
   meaning sibling-group completed outputs could be erased. Removed both
   route-level calls; auto-dispatch lives entirely in `updateRow`.

2. **`runWorkflowColumn` log-spamming on plain tables.**
   `if (targetGroups.length === 0) throw new Error(...)` fired on every
   row insert/update for tables without any workflow groups (the
   majority). Every caller wraps with `.catch(logger.error)`, so each
   PATCH produced an error-level log. Return `{ dispatchId: null }`
   silently — manual `runWorkflowColumn` callers pass `groupIds`
   explicitly so they can't reach this branch.

3. **`isManualRun` plumbed through dispatch SSE events.** Late-arriving
   `kind: 'dispatch'` events for dispatches not in the initial fetch
   were hardcoding `isManualRun: false`. Added the field to the event
   shape, emit it from `dispatcherStep` (pending → complete, dispatching
   transitions) and `markActiveDispatchesCancelled`, and consume it in
   the SSE handler with a sensible fallback for legacy emits.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(table): row executions sidecar + left-to-right dep retrigger + cancel counter refresh

Split per-row workflow-group execution state out of the user_table_rows.executions
JSONB column into a new table_row_executions sidecar keyed by (row_id, group_id).
Dispatcher filters, "X running" counter, bulk clears, and the cancellation guard
all hit indexed columns instead of walking JSONB. Wire shape unchanged — server
merges sidecar rows back into row.executions on the way out.

Also:
- deriveExecClearsForDataPatch now walks workflowGroups left-to-right with a
  propagating dirtied-column set so transitive dep chains (edit col A → group 1
  re-runs → group 2 depends on group 1's output → group 2 re-runs) collapse to
  a single forward pass.
- useCancelTableRuns.onSettled invalidates the activeDispatches query so the
  top-right counter and row gutter Stop button refetch from the server after
  any Stop (per-cell, row, or table-wide). countRunningCells is the source of
  truth; client no longer needs duplicate state.

Three migrations on this branch (0209 + 0210 + new sidecar) collapsed into one
since the feature is unreleased.

* fix(table): address remaining cursor/greptile review feedback

- Mothership update_row no longer double-dispatches. updateRow already fires
  the auto-cascade internally; the second `mode: 'incomplete'` call here
  raced with it and could bulk-clear sibling-group outputs.
- SSE dispatch events no longer dropped when the activeDispatches cache is
  cold. Seed an empty TableRunState if the initial fetch hasn't landed yet
  so the queued overlay doesn't lose the first dispatch event.
- batchUpdateRows now runs cancel+rerun for per-row in-flight downstream
  groups, mirroring updateRow. Without this, dep edits in a batch left
  running workflows reading stale upstream values.

* fix(table): cancel prior runs, scope batch insert dispatch, recover orphan pre-stamps

Addresses cursor + greptile review feedback on table dispatcher edge cases:

- Manual table-wide Run-all / Run-column now cancels prior active dispatches
  AND in-flight cell workers before bulk-clearing. Without this, mode:'all'
  deleted running sidecar rows out from under their workers (which kept
  writing into the wiped state) and a second Run-all could enqueue overlapping
  cells racing on the same rows. Row-scoped manual calls (dep-edit cascade)
  are excluded — those already cancel their own scope.
- batchInsertRowsWithTx now scopes its auto-dispatch to the newly-inserted
  row ids. Without this, after the sidecar migration the NOT EXISTS filter
  matches every existing row (zero sidecar entries), so a CSV import would
  walk the entire table dispatching workflow runs on every pre-existing row.
- classifyEligibility carve-out: pending + executionId=null is an orphan
  pre-stamp (cascade-lock contention, batchEnqueueAndWait failure, etc.),
  treated as claimable so future dispatchers can re-stamp instead of skipping
  it as 'in-flight' forever. Matches pickNextEligibleGroupForRow's logic.
- On batchEnqueueAndWait failure, dispatcherStep now sweeps the orphan
  pre-stamps it wrote for the failed batch so the cells don't render Queued
  forever; the next user action picks them up cleanly.

* fix(table): row-scoped Refresh cancels in-flight; counter includes queued/pending

- runWorkflowColumn now cancels prior in-flight cells for row-scoped manual
  runs too (context-menu Refresh on a row subset, action-bar Refresh on
  selected rows). Previously only the table-wide path cancelled, so a
  row-scoped Refresh would bulk-clear running sidecar rows without aborting
  workers. Per-row cancel skips markActiveDispatchesCancelled so unrelated
  dispatches keep running.
- countRunningCells now counts all in-flight statuses (queued / running /
  pending) instead of just running. The row gutter Run/Stop button reads
  this map — with the old behavior, clicking Play during the queued window
  would re-enqueue an already-queued cell. SSE applyCell handler updated
  to use isExecInFlight so client deltas track the same semantics.

* fix(table): per-row Stop tombstones ahead-of-cursor rows during Run-all

Per-row Stop only cancelled sidecar rows already in flight. A row the
dispatcher hadn't reached yet had no exec record, so Stop was a no-op there
— the dispatcher would later walk to it, classify the group eligible, and
re-fire workflows the user thought they stopped.

cancelWorkflowGroupRuns now, for a per-row cancel, checks active dispatches
whose scope covers the row and writes `cancelled` tombstones (cancelledAt =
now) for the at-risk groups that don't already have a sidecar entry. The
dispatcher's existing `cancelledAt > dispatch.requestedAt` filter then skips
them when the cursor arrives. onConflictDoNothing guards against clobbering
a concurrently-written entry; the active-dispatch check avoids stamping
spurious cancels on idle rows.

* fix(table): seed dispatch overlay on Run; surface batch-enqueue failures as error

- useRunColumn.onSuccess invalidates the activeDispatches query so the
  resolveCellExec queued overlay populates immediately for ahead-of-cursor
  rows (scrolled-in / refetched), instead of waiting for the first dispatch
  SSE. Targeted at activeDispatches only — the rows cache stays owned by
  useTableEventStream.
- On batchEnqueueAndWait failure, dispatcherStep now flips the orphan
  pre-stamps to a terminal `error` state and emits a cell SSE event, rather
  than deleting them. The cursor still advances past the window, but the
  dropped cells are now visible (Error pill) instead of silently empty, stay
  out of the in-flight set, and re-run on the next manual run.

* fix(table): seed dispatch overlay on Run; surface batch-enqueue failures as error

- useRunColumn.onSuccess invalidates activeDispatches so the resolveCellExec
  queued overlay populates immediately for ahead-of-cursor rows instead of
  waiting for the first dispatch SSE. Rows cache stays owned by SSE.
- On batchEnqueueAndWait failure, dispatcherStep flips orphan pre-stamps to a
  terminal error state (+ cell SSE) instead of deleting them, so the dropped
  window is visible (Error pill) rather than silently empty and re-runs on the
  next manual run.

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 apps/sim/app/api/resume/poll/route.ts         |    12 +-
 .../api/table/[tableId]/columns/run/route.ts  |    10 +-
 .../api/table/[tableId]/dispatches/route.ts   |    65 +
 .../api/table/[tableId]/rows/[rowId]/route.ts |     5 +
 .../sim/app/api/table/[tableId]/rows/route.ts |    51 +-
 .../v1/tables/[tableId]/rows/[rowId]/route.ts |     3 +
 .../table-grid/cells/cell-render.tsx          |    56 +-
 .../components/table-grid/data-row.tsx        |    30 +-
 .../table-grid/headers/column-header-menu.tsx |     4 +-
 .../headers/workflow-group-meta-cell.tsx      |     8 +-
 .../components/table-grid/table-grid.tsx      |    63 +-
 .../[tableId]/components/table-grid/utils.ts  |    37 +
 .../workflow-sidebar/run-settings-section.tsx |    18 +-
 .../workflow-sidebar/workflow-sidebar.tsx     |    65 +-
 .../[tableId]/hooks/use-table-event-stream.ts |    94 +-
 apps/sim/background/resume-execution.ts       |   374 +-
 apps/sim/background/table-run-dispatcher.ts   |    37 +
 .../background/workflow-column-execution.ts   |   193 +-
 apps/sim/hooks/queries/tables.ts              |   140 +-
 apps/sim/lib/api/contracts/tables.ts          |    51 +-
 .../copilot/tools/server/table/user-table.ts  |    14 +-
 .../lib/core/async-jobs/backends/database.ts  |    60 +-
 .../core/async-jobs/backends/trigger-dev.ts   |    52 +
 apps/sim/lib/core/async-jobs/config.ts        |    10 +-
 apps/sim/lib/core/async-jobs/types.ts         |    39 +
 apps/sim/lib/table/cascade-lock.ts            |    61 +
 apps/sim/lib/table/cell-write.ts              |     5 +-
 apps/sim/lib/table/deps.ts                    |    41 +-
 apps/sim/lib/table/dispatcher.ts              |   543 +
 apps/sim/lib/table/events.ts                  |    66 +-
 apps/sim/lib/table/service.ts                 |   761 +-
 apps/sim/lib/table/types.ts                   |    27 +-
 apps/sim/lib/table/workflow-columns.ts        |   714 +-
 packages/db/migrations/0209_smiling_fixer.sql |    41 +
 .../db/migrations/meta/0209_snapshot.json     | 16431 ++++++++++++++++
 packages/db/migrations/meta/_journal.json     |     7 +
 packages/db/schema.ts                         |    93 +-
 packages/testing/src/mocks/database.mock.ts   |    13 +-
 packages/testing/src/mocks/schema.mock.ts     |    28 +
 scripts/check-api-validation-contracts.ts     |     4 +-
 40 files changed, 19416 insertions(+), 910 deletions(-)
 create mode 100644 apps/sim/app/api/table/[tableId]/dispatches/route.ts
 create mode 100644 apps/sim/background/table-run-dispatcher.ts
 create mode 100644 apps/sim/lib/table/cascade-lock.ts
 create mode 100644 apps/sim/lib/table/dispatcher.ts
 create mode 100644 packages/db/migrations/0209_smiling_fixer.sql
 create mode 100644 packages/db/migrations/meta/0209_snapshot.json

diff --git a/apps/sim/app/api/resume/poll/route.ts b/apps/sim/app/api/resume/poll/route.ts
index ad07ea009b5..86edf2f218c 100644
--- a/apps/sim/app/api/resume/poll/route.ts
+++ b/apps/sim/app/api/resume/poll/route.ts
@@ -139,13 +139,21 @@ async function dispatchRow(row: DueRow, now: Date): Promise<RowResult> {
       })
 
       if (enqueueResult.status === 'starting') {
-        PauseResumeManager.startResumeExecution({
+        // Route through `executeResumeJob` (not `PauseResumeManager.startResumeExecution`
+        // directly) so cell-context restoration + cascade-loop continuation
+        // fires. This is the same primitive the trigger.dev `resumeExecutionTask`
+        // wraps — calling it directly handles both trigger.dev-disabled local
+        // dev and trigger.dev-enabled prod identically.
+        const { executeResumeJob } = await import('@/background/resume-execution')
+        void executeResumeJob({
           resumeEntryId: enqueueResult.resumeEntryId,
           resumeExecutionId: enqueueResult.resumeExecutionId,
-          pausedExecution: enqueueResult.pausedExecution,
+          pausedExecutionId: enqueueResult.pausedExecution.id,
           contextId: enqueueResult.contextId,
           resumeInput: enqueueResult.resumeInput,
           userId: enqueueResult.userId,
+          workflowId: row.workflowId,
+          parentExecutionId: row.executionId,
         }).catch((error) => {
           logger.error('Background time-pause resume failed', {
             executionId: row.executionId,
diff --git a/apps/sim/app/api/table/[tableId]/columns/run/route.ts b/apps/sim/app/api/table/[tableId]/columns/run/route.ts
index eddfc416e0a..2b96981d115 100644
--- a/apps/sim/app/api/table/[tableId]/columns/run/route.ts
+++ b/apps/sim/app/api/table/[tableId]/columns/run/route.ts
@@ -1,5 +1,4 @@
 import { createLogger } from '@sim/logger'
-import { toError } from '@sim/utils/errors'
 import { type NextRequest, NextResponse } from 'next/server'
 import { runColumnContract } from '@/lib/api/contracts/tables'
 import { parseRequest } from '@/lib/api/server'
@@ -30,21 +29,16 @@ export const POST = withRouteHandler(async (request: NextRequest, { params }: Ro
     const access = await checkAccess(tableId, auth.userId, 'write')
     if (!access.ok) return accessError(access, requestId, tableId)
 
-    // Dispatch in the background — large fan-outs (thousands of rows) issue
-    // sequential trigger.dev calls and would otherwise hold the HTTP response
-    // open for minutes, blocking the AI/copilot tool span and the UI mutation.
-    void runWorkflowColumn({
+    const { dispatchId } = await runWorkflowColumn({
       tableId,
       workspaceId,
       groupIds,
       mode: runMode,
       rowIds,
       requestId,
-    }).catch((err) => {
-      logger.error(`[${requestId}] run-column dispatch failed:`, toError(err).message)
     })
 
-    return NextResponse.json({ success: true, data: { triggered: null } })
+    return NextResponse.json({ success: true, data: { dispatchId } })
   } catch (error) {
     if (error instanceof Error && error.message === 'Invalid workspace ID') {
       return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
diff --git a/apps/sim/app/api/table/[tableId]/dispatches/route.ts b/apps/sim/app/api/table/[tableId]/dispatches/route.ts
new file mode 100644
index 00000000000..a5e442f05dd
--- /dev/null
+++ b/apps/sim/app/api/table/[tableId]/dispatches/route.ts
@@ -0,0 +1,65 @@
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { type ActiveDispatch, listActiveDispatchesContract } from '@/lib/api/contracts/tables'
+import { parseRequest } from '@/lib/api/server'
+import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { generateRequestId } from '@/lib/core/utils/request'
+import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
+import { countRunningCells, listActiveDispatches } from '@/lib/table/dispatcher'
+import { accessError, checkAccess } from '@/app/api/table/utils'
+
+const logger = createLogger('TableDispatchesAPI')
+
+interface RouteParams {
+  params: Promise<{ tableId: string }>
+}
+
+/**
+ * GET /api/table/[tableId]/dispatches
+ *
+ * Returns active (`pending` / `dispatching`) dispatches for the table. Drives
+ * the client's "about to run" overlay so refresh during a long Run-all keeps
+ * the queued indicators on rows the dispatcher hasn't reached yet.
+ */
+export const GET = withRouteHandler(async (request: NextRequest, { params }: RouteParams) => {
+  const requestId = generateRequestId()
+
+  try {
+    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    if (!authResult.success || !authResult.userId) {
+      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
+    }
+
+    const parsed = await parseRequest(listActiveDispatchesContract, request, { params })
+    if (!parsed.success) return parsed.response
+    const { tableId } = parsed.data.params
+
+    const result = await checkAccess(tableId, authResult.userId, 'read')
+    if (!result.ok) return accessError(result, requestId, tableId)
+
+    const [rows, running] = await Promise.all([
+      listActiveDispatches(tableId),
+      countRunningCells(tableId),
+    ])
+    const dispatches: ActiveDispatch[] = rows.map((r) => ({
+      id: r.id,
+      status: r.status as 'pending' | 'dispatching',
+      mode: r.mode,
+      isManualRun: r.isManualRun,
+      cursor: r.cursor,
+      scope: r.scope,
+    }))
+
+    return NextResponse.json({
+      success: true,
+      data: {
+        dispatches,
+        runningCellCount: running.total,
+        runningByRowId: running.byRowId,
+      },
+    })
+  } catch (error) {
+    logger.error(`[${requestId}] list-dispatches failed:`, error)
+    return NextResponse.json({ error: 'Failed to list active dispatches' }, { status: 500 })
+  }
+})
diff --git a/apps/sim/app/api/table/[tableId]/rows/[rowId]/route.ts b/apps/sim/app/api/table/[tableId]/rows/[rowId]/route.ts
index 9a4a988bc25..fe7452230ee 100644
--- a/apps/sim/app/api/table/[tableId]/rows/[rowId]/route.ts
+++ b/apps/sim/app/api/table/[tableId]/rows/[rowId]/route.ts
@@ -136,6 +136,11 @@ export const PATCH = withRouteHandler(async (request: NextRequest, context: RowR
     // Only `null` when a `cancellationGuard` is supplied and the SQL guard
     // rejects the write — this route doesn't pass one, so reaching null is a bug.
     if (!updatedRow) throw new Error('updateRow returned null without a cancellationGuard')
+    // Auto-dispatch for user edits is handled inside `updateRow` (mode: 'new').
+    // Firing a second mode: 'incomplete' dispatch here would race with the
+    // `mode: 'new'` one AND bulk-clear sibling-group outputs (the incomplete
+    // bulk-clear wipes ALL targeted columns when any one column on the row
+    // is empty).
 
     return NextResponse.json({
       success: true,
diff --git a/apps/sim/app/api/table/[tableId]/rows/route.ts b/apps/sim/app/api/table/[tableId]/rows/route.ts
index 414ac57d41a..8e29e12005c 100644
--- a/apps/sim/app/api/table/[tableId]/rows/route.ts
+++ b/apps/sim/app/api/table/[tableId]/rows/route.ts
@@ -1,8 +1,8 @@
 import { db } from '@sim/db'
-import { userTableRows } from '@sim/db/schema'
+import { tableRowExecutions, userTableRows } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
-import { and, eq, sql } from 'drizzle-orm'
+import { and, eq, inArray, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import {
   type BatchInsertTableRowsBodyInput,
@@ -17,7 +17,14 @@ import { isZodError, validationErrorResponse } from '@/lib/api/server/validation
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import type { Filter, RowData, Sort, TableSchema } from '@/lib/table'
+import type {
+  Filter,
+  RowData,
+  RowExecutionMetadata,
+  RowExecutions,
+  Sort,
+  TableSchema,
+} from '@/lib/table'
 import {
   batchInsertRows,
   batchUpdateRows,
@@ -283,7 +290,6 @@ export const GET = withRouteHandler(
         .select({
           id: userTableRows.id,
           data: userTableRows.data,
-          executions: userTableRows.executions,
           position: userTableRows.position,
           createdAt: userTableRows.createdAt,
           updatedAt: userTableRows.updatedAt,
@@ -313,6 +319,41 @@ export const GET = withRouteHandler(
 
       const rows = await query.limit(validated.limit).offset(validated.offset)
 
+      // Sidecar: fetch per-(row, group) execution state and group into a map
+      // so the response preserves the legacy `row.executions[groupId]` wire
+      // shape. One indexed-IN scan against table_row_executions.
+      const executionsByRow = new Map<string, RowExecutions>()
+      if (rows.length > 0) {
+        const execRows = await db
+          .select()
+          .from(tableRowExecutions)
+          .where(
+            inArray(
+              tableRowExecutions.rowId,
+              rows.map((r) => r.id)
+            )
+          )
+        for (const e of execRows) {
+          const existing = executionsByRow.get(e.rowId) ?? {}
+          const meta: RowExecutionMetadata = {
+            status: e.status as RowExecutionMetadata['status'],
+            executionId: e.executionId ?? null,
+            jobId: e.jobId ?? null,
+            workflowId: e.workflowId,
+            error: e.error ?? null,
+            ...(e.runningBlockIds && e.runningBlockIds.length > 0
+              ? { runningBlockIds: e.runningBlockIds }
+              : {}),
+            ...(e.blockErrors && Object.keys(e.blockErrors as Record<string, string>).length > 0
+              ? { blockErrors: e.blockErrors as Record<string, string> }
+              : {}),
+            ...(e.cancelledAt ? { cancelledAt: e.cancelledAt.toISOString() } : {}),
+          }
+          existing[e.groupId] = meta
+          executionsByRow.set(e.rowId, existing)
+        }
+      }
+
       logger.info(
         `[${requestId}] Queried ${rows.length} rows from table ${tableId} (total: ${totalCount ?? 'n/a'})`
       )
@@ -323,7 +364,7 @@ export const GET = withRouteHandler(
           rows: rows.map((r) => ({
             id: r.id,
             data: r.data,
-            executions: r.executions ?? {},
+            executions: executionsByRow.get(r.id) ?? {},
             position: r.position,
             createdAt:
               r.createdAt instanceof Date ? r.createdAt.toISOString() : String(r.createdAt),
diff --git a/apps/sim/app/api/v1/tables/[tableId]/rows/[rowId]/route.ts b/apps/sim/app/api/v1/tables/[tableId]/rows/[rowId]/route.ts
index 810bb0dfc65..96e2cf323c0 100644
--- a/apps/sim/app/api/v1/tables/[tableId]/rows/[rowId]/route.ts
+++ b/apps/sim/app/api/v1/tables/[tableId]/rows/[rowId]/route.ts
@@ -144,6 +144,9 @@ export const PATCH = withRouteHandler(async (request: NextRequest, context: RowR
     if (!updatedRow) {
       return NextResponse.json({ error: 'Row not found' }, { status: 404 })
     }
+    // Auto-dispatch for user edits is handled inside `updateRow` (mode: 'new').
+    // Firing a second mode: 'incomplete' dispatch here would race with it AND
+    // bulk-clear sibling-group outputs.
 
     return NextResponse.json({
       success: true,
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
index c2c78971d90..6d63bca978b 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
@@ -1,6 +1,7 @@
 'use client'
 
 import type React from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { parse } from 'tldts'
 import { Badge, Checkbox, Tooltip } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
@@ -60,6 +61,14 @@ export function resolveCellRender({
     if (!isNull) return { kind: 'value', text: stringifyValue(value) }
 
     if (inFlight && !(groupHasBlockErrors && !blockRunning)) {
+      // A `pending` cell whose jobId starts with `paused-` is mid-pause
+      // (workflow yielded for human-in-the-loop). Render as Pending rather
+      // than Queued so the user can tell it's not just waiting to start.
+      const isPaused =
+        exec?.status === 'pending' &&
+        typeof exec.jobId === 'string' &&
+        exec.jobId.startsWith('paused-')
+      if (isPaused) return { kind: 'pending-upstream' }
       if (exec?.status === 'queued' || exec?.status === 'pending') return { kind: 'queued' }
       return { kind: 'pending-upstream' }
     }
@@ -119,6 +128,9 @@ interface CellRenderProps {
 }
 
 export function CellRender({ kind, isEditing }: CellRenderProps): React.ReactElement | null {
+  const valueText = kind.kind === 'value' ? kind.text : null
+  const revealedValueText = useTypewriter(valueText)
+
   switch (kind.kind) {
     case 'value':
       return (
@@ -128,7 +140,7 @@ export function CellRender({ kind, isEditing }: CellRenderProps): React.ReactEle
             isEditing && 'invisible'
           )}
         >
-          {kind.text}
+          {revealedValueText ?? kind.text}
         </span>
       )
 
@@ -275,3 +287,45 @@ function Wrap({ isEditing, children }: { isEditing: boolean; children: React.Rea
   if (!isEditing) return <>{children}</>
   return <div className='invisible'>{children}</div>
 }
+
+const TYPEWRITER_MS_PER_CHAR = 15
+
+/**
+ * Reveals `text` character-by-character whenever it changes after the first
+ * render. Initial render (page hydration or virtualization remount) shows the
+ * value statically — animation fires only for subsequent updates, which in
+ * practice means SSE-driven workflow completions arriving via
+ * `useTableEventStream → applyCell()`.
+ */
+function useTypewriter(text: string | null): string | null {
+  const [revealed, setRevealed] = useState<string | null>(text)
+  const isFirstRunRef = useRef(true)
+  const prevTextRef = useRef<string | null>(text)
+
+  useEffect(() => {
+    if (isFirstRunRef.current) {
+      isFirstRunRef.current = false
+      prevTextRef.current = text
+      setRevealed(text)
+      return
+    }
+    if (prevTextRef.current === text) return
+    prevTextRef.current = text
+
+    if (text === null || text.length === 0) {
+      setRevealed(text)
+      return
+    }
+
+    setRevealed('')
+    let i = 0
+    const id = window.setInterval(() => {
+      i++
+      setRevealed(text.slice(0, i))
+      if (i >= text.length) window.clearInterval(id)
+    }, TYPEWRITER_MS_PER_CHAR)
+    return () => window.clearInterval(id)
+  }, [text])
+
+  return revealed
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/data-row.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/data-row.tsx
index b340fb95d2a..aed56ac8de4 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/data-row.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/data-row.tsx
@@ -3,6 +3,7 @@
 import React from 'react'
 import { Button, Checkbox } from '@/components/emcn'
 import { PlayOutline, Square } from '@/components/emcn/icons'
+import type { ActiveDispatch } from '@/lib/api/contracts/tables'
 import { cn } from '@/lib/core/utils/cn'
 import { handleKeyboardActivation } from '@/lib/core/utils/keyboard'
 import type { TableRow as TableRowType, WorkflowGroup } from '@/lib/table'
@@ -17,7 +18,7 @@ import {
   SELECTION_TINT_BG,
 } from './constants'
 import type { DisplayColumn } from './types'
-import { type NormalizedSelection, readExecution } from './utils'
+import { type NormalizedSelection, resolveCellExec } from './utils'
 
 export interface DataRowProps {
   row: TableRowType
@@ -50,6 +51,12 @@ export interface DataRowProps {
    * for empty workflow-output cells whose group has unmet dependencies.
    */
   workflowGroups: WorkflowGroup[]
+  /**
+   * Active dispatches on the table — rows in scope ahead of the dispatcher's
+   * cursor render as `Queued` until the dispatcher pre-stamps them. Preserves
+   * queued indicators across page refresh during long Run-all dispatches.
+   */
+  activeDispatches: ActiveDispatch[] | undefined
 }
 
 function cellRangeRowChanged(
@@ -105,7 +112,8 @@ function dataRowPropsAreEqual(prev: DataRowProps, next: DataRowProps): boolean {
     prev.numDivWidth !== next.numDivWidth ||
     prev.onStopRow !== next.onStopRow ||
     prev.onRunRow !== next.onRunRow ||
-    prev.workflowGroups !== next.workflowGroups
+    prev.workflowGroups !== next.workflowGroups ||
+    prev.activeDispatches !== next.activeDispatches
   ) {
     return false
   }
@@ -148,6 +156,7 @@ export const DataRow = React.memo(function DataRow({
   onStopRow,
   onRunRow,
   workflowGroups,
+  activeDispatches,
 }: DataRowProps) {
   const sel = normalizedSelection
   /**
@@ -178,8 +187,8 @@ export const DataRow = React.memo(function DataRow({
       <td className={cn(CELL_CHECKBOX, 'cursor-pointer')}>
         <div
           className={cn(
-            'flex items-center gap-1',
-            hasWorkflowColumns ? 'justify-between' : 'justify-center'
+            'flex items-center',
+            hasWorkflowColumns ? 'justify-end gap-1.5 pr-1' : 'justify-center'
           )}
         >
           <div
@@ -221,10 +230,7 @@ export const DataRow = React.memo(function DataRow({
               size='sm'
               aria-label={runningCount > 0 ? `Stop ${runningCount} running` : 'Run row'}
               title={runningCount > 0 ? `Stop ${runningCount} running` : 'Run row'}
-              // mr-px keeps the hover bg off the cell's right border — without
-              // it the rounded-rect background paints over the divider line
-              // while the button is hovered.
-              className='mr-px size-[20px] shrink-0 p-0 text-[var(--text-primary)] hover-hover:bg-[var(--surface-2)]'
+              className='size-[20px] shrink-0 p-0 text-[var(--text-primary)] hover-hover:bg-[var(--surface-2)]'
               onClick={() => {
                 if (runningCount > 0) {
                   onStopRow(row.id)
@@ -309,7 +315,13 @@ export const DataRow = React.memo(function DataRow({
                     ? pendingCellValue[column.name]
                     : row.data[column.name]
                 }
-                exec={readExecution(row, column.workflowGroupId)}
+                exec={resolveCellExec(
+                  row,
+                  column.workflowGroupId
+                    ? workflowGroups.find((g) => g.id === column.workflowGroupId)
+                    : undefined,
+                  activeDispatches
+                )}
                 column={column}
                 isEditing={isEditing}
                 initialCharacter={isEditing ? initialCharacter : undefined}
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
index e3c437f2588..06a004843e2 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
@@ -89,12 +89,12 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
     ? workflows?.find((w) => w.id === ownGroup.workflowId)
     : undefined
   // Workflow-output column with siblings → "Hide column" (non-destructive,
-  // re-addable from sidebar). Last output of a group → "Delete workflow"
+  // re-addable from sidebar). Last output of a group → "Delete column"
   // (removes the entire group). Plain column → undefined (default "Delete column").
   const deleteLabel = ownGroup
     ? ownGroup.outputs.length > 1
       ? 'Hide column'
-      : 'Delete workflow'
+      : 'Delete column'
     : undefined
   useEffect(() => {
     if (isRenaming && renameInputRef.current) {
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
index 70f2cc9ac6a..23fa84f2227 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
@@ -35,9 +35,9 @@ interface ColumnOptionsMenuProps {
   position: { x: number; y: number }
   column: DisplayColumn
   /** Override for the destructive item's label. Defaults to "Delete column"
-   *  (or "Delete workflow" when `onDeleteGroup` is set). Use "Hide column"
-   *  when the destructive action is non-lossy (workflow-output column where
-   *  removing it leaves the group with siblings). */
+   *  for both plain columns and workflow groups. Use "Hide column" when the
+   *  destructive action is non-lossy (workflow-output column where removing
+   *  it leaves the group with siblings). */
   deleteLabel?: string
   onOpenConfig: (columnName: string) => void
   onInsertLeft: (columnName: string) => void
@@ -156,7 +156,7 @@ export function ColumnOptionsMenu({
           onSelect={() => (onDeleteGroup ? onDeleteGroup() : onDeleteColumn(column.name))}
         >
           {deleteLabel === 'Hide column' ? <EyeOff /> : <Trash />}
-          {deleteLabel ?? (onDeleteGroup ? 'Delete workflow' : 'Delete column')}
+          {deleteLabel ?? 'Delete column'}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx
index 2640e0a1453..698c6b31e4d 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx
@@ -12,7 +12,6 @@ import { cn } from '@/lib/core/utils/cn'
 import { captureEvent } from '@/lib/posthog/client'
 import type { ColumnDefinition, TableRow as TableRowType } from '@/lib/table'
 import { TABLE_LIMITS } from '@/lib/table/constants'
-import { isExecInFlight } from '@/lib/table/deps'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import {
   useAddTableColumn,
@@ -21,6 +20,7 @@ import {
   useCreateTableRow,
   useDeleteColumn,
   useDeleteWorkflowGroup,
+  useTableRunState,
   useUpdateColumn,
   useUpdateTableMetadata,
   useUpdateTableRow,
@@ -73,6 +73,8 @@ import {
 
 const logger = createLogger('TableView')
 
+const EMPTY_RUNNING_BY_ROW: Readonly<Record<string, number>> = Object.freeze({})
+
 const COL_WIDTH_MIN = 80
 const COL_WIDTH_AUTO_FIT_MAX = 1000
 const SKELETON_COL_COUNT = 4
@@ -300,6 +302,11 @@ export function TableGrid({
     ensureAllRowsLoaded,
   } = useTable({ workspaceId, tableId, queryOptions })
 
+  const { data: tableRunState } = useTableRunState(tableId)
+  const activeDispatches = tableRunState?.dispatches
+  const totalRunning = tableRunState?.runningCellCount ?? 0
+  const runningByRowId = tableRunState?.runningByRowId ?? EMPTY_RUNNING_BY_ROW
+
   const fetchNextPageRef = useRef(fetchNextPage)
   fetchNextPageRef.current = fetchNextPage
   const hasNextPageRef = useRef(hasNextPage)
@@ -652,12 +659,20 @@ export function TableGrid({
     if (_col && _gid) {
       const _exec = contextMenu.row.executions?.[_gid]
       contextMenuIsWorkflowColumn = true
-      // Only `completed` / `error` / `running` cells are guaranteed to have a
-      // server-side execution log. `queued` / `pending` haven't started yet;
-      // `cancelled` may have been cancelled before the worker ever picked the
-      // job up, so its executionId can't be relied on either.
+      // Cells with a server-side execution log: `completed` / `error` /
+      // `running`, plus HITL-paused runs (status `pending` with a `paused-`
+      // jobId — has a real executionId + viewable trace). `queued` / plain
+      // `pending` haven't started yet; `cancelled` may have been cancelled
+      // before the worker ever picked the job up.
+      const _isPaused =
+        _exec?.status === 'pending' &&
+        typeof _exec?.jobId === 'string' &&
+        _exec.jobId.startsWith('paused-')
       contextMenuHasStartedRun =
-        _exec?.status === 'completed' || _exec?.status === 'error' || _exec?.status === 'running'
+        _exec?.status === 'completed' ||
+        _exec?.status === 'error' ||
+        _exec?.status === 'running' ||
+        _isPaused
       contextMenuExecutionId = _exec?.executionId ?? null
     }
   }
@@ -2690,22 +2705,11 @@ export function TableGrid({
     return ids.length > 0 ? ids : null
   }, [rowSelection, rows])
 
-  const { runningByRowId, totalRunning } = useMemo(() => {
-    const byRow = new Map<string, number>()
-    let total = 0
-    for (const row of rows) {
-      let count = 0
-      const executions = row.executions ?? {}
-      for (const gid in executions) {
-        if (isExecInFlight(executions[gid])) count++
-      }
-      if (count > 0) {
-        byRow.set(row.id, count)
-        total += count
-      }
-    }
-    return { runningByRowId: byRow, totalRunning: total }
-  }, [rows])
+  // `runningByRowId` + `totalRunning` come from `useTableRunState` above —
+  // backend-bootstrapped via `countRunningCells` and kept live by
+  // `applyCell`'s SSE-driven delta. Counts only cells whose worker has
+  // actually claimed the cell (`status === 'running'`), ignoring optimistic
+  // queued/pending stamps.
 
   // Context-menu wrappers: act on `contextMenuRowIds`, then close the menu.
   // Mirror the action bar's Play / Refresh split: Play fills empty/failed,
@@ -2726,7 +2730,7 @@ export function TableGrid({
   // Total running/queued cells across the rows the context menu is acting on;
   // drives the "Stop N running workflows" item, shown only when > 0.
   const runningInContextSelection = contextMenuRowIds.reduce(
-    (total, rowId) => total + (runningByRowId.get(rowId) ?? 0),
+    (total, rowId) => total + (runningByRowId[rowId] ?? 0),
     0
   )
 
@@ -2757,7 +2761,7 @@ export function TableGrid({
     return []
   }, [rowSelection, normalizedSelection, rows])
   const runningInActionBarSelection = actionBarRowIds.reduce(
-    (total, rowId) => total + (runningByRowId.get(rowId) ?? 0),
+    (total, rowId) => total + (runningByRowId[rowId] ?? 0),
     0
   )
 
@@ -2785,11 +2789,17 @@ export function TableGrid({
     }
     const exec = row.executions?.[groupId]
     const status = exec?.status
+    // A `pending` execution with a `paused-` jobId is a HITL-paused run —
+    // it has a real executionId and a viewable trace, same as
+    // running/completed/error.
+    const isPaused =
+      status === 'pending' && typeof exec?.jobId === 'string' && exec.jobId.startsWith('paused-')
     return {
       rowId: row.id,
       groupId,
       executionId: exec?.executionId ?? null,
-      canViewExecution: status === 'completed' || status === 'error' || status === 'running',
+      canViewExecution:
+        status === 'completed' || status === 'error' || status === 'running' || isPaused,
     }
   }, [normalizedSelection, rows, displayColumns])
 
@@ -3149,12 +3159,13 @@ export function TableGrid({
                         onCellMouseEnter={handleCellMouseEnter}
                         isRowChecked={rowSelectionIncludes(rowSelection, row.id)}
                         onRowToggle={handleRowToggle}
-                        runningCount={runningByRowId.get(row.id) ?? 0}
+                        runningCount={runningByRowId[row.id] ?? 0}
                         hasWorkflowColumns={hasWorkflowColumns}
                         numDivWidth={numDivWidth}
                         onStopRow={onStopRow}
                         onRunRow={onRunRow}
                         workflowGroups={tableWorkflowGroups}
+                        activeDispatches={activeDispatches}
                       />
                     ))}
                   </>
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts
index a0efce3b877..50f7aae85af 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/utils.ts
@@ -1,3 +1,4 @@
+import type { ActiveDispatch } from '@/lib/api/contracts/tables'
 import type {
   ColumnDefinition,
   RowExecutionMetadata,
@@ -5,6 +6,7 @@ import type {
   TableRow as TableRowType,
   WorkflowGroup,
 } from '@/lib/table'
+import { areGroupDepsSatisfied, areOutputsFilled } from '@/lib/table/deps'
 import type { DeletedRowSnapshot } from '@/stores/table/types'
 import type { DisplayColumn } from './types'
 
@@ -166,6 +168,41 @@ export function readExecution(
   return row?.executions?.[groupId]
 }
 
+/**
+ * Resolves a cell's execution state with the "about to run" overlay applied:
+ * for cells in an active dispatch's scope ahead of its cursor whose deps are
+ * already satisfied, returns a synthetic `pending` exec so the renderer
+ * shows `Queued`. Cells with a real DB exec always win — the overlay only
+ * fills the gap between dispatch start and the dispatcher's per-row pending
+ * stamp. Cells with unmet deps still render as `Waiting` (the renderer
+ * computes that from `waitingOnLabels`).
+ */
+export function resolveCellExec(
+  row: TableRowType,
+  group: WorkflowGroup | undefined,
+  activeDispatches: ActiveDispatch[] | undefined
+): RowExecutionMetadata | undefined {
+  if (!group) return undefined
+  const real = row.executions?.[group.id]
+  if (real) return real
+  if (!activeDispatches || activeDispatches.length === 0) return undefined
+  if (areOutputsFilled(group, row)) return undefined
+  if (!areGroupDepsSatisfied(group, row)) return undefined
+  for (const d of activeDispatches) {
+    if (!d.scope.groupIds.includes(group.id)) continue
+    if (d.scope.rowIds && !d.scope.rowIds.includes(row.id)) continue
+    if (row.position <= d.cursor) continue
+    return {
+      status: 'pending',
+      executionId: null,
+      jobId: null,
+      workflowId: group.workflowId,
+      error: null,
+    }
+  }
+  return undefined
+}
+
 export interface ExecStatusMix {
   hasIncompleteOrFailed: boolean
   hasCompleted: boolean
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/run-settings-section.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/run-settings-section.tsx
index 320eda4bd1f..ad8e460585a 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/run-settings-section.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/run-settings-section.tsx
@@ -10,15 +10,22 @@ interface RunSettingsSectionProps {
   /** Column names this group waits on. */
   deps: string[]
   onChangeDeps: (next: string[]) => void
+  /** Inline validation error rendered under the picker. */
+  error?: string | null
 }
 
 /**
  * "Run after" picker: which upstream columns must be filled before this group
  * fires. Workflow output columns count the same as plain columns — once a
- * column is non-empty, the dep is satisfied. Empty selection = the group fires
- * on any row change.
+ * column is non-empty, the dep is satisfied. At least one dep is required
+ * when auto-run is on.
  */
-export function RunSettingsSection({ depOptions, deps, onChangeDeps }: RunSettingsSectionProps) {
+export function RunSettingsSection({
+  depOptions,
+  deps,
+  onChangeDeps,
+  error,
+}: RunSettingsSectionProps) {
   const options = depOptions.map((c) => ({ label: c.name, value: c.name }))
 
   return (
@@ -38,11 +45,12 @@ export function RunSettingsSection({ depOptions, deps, onChangeDeps }: RunSettin
         multiSelectValues={deps}
         onMultiSelectChange={onChangeDeps}
         overlayContent={
-          <span className='truncate text-[var(--text-primary)]'>
-            {deps.length === 0 ? 'Any row change' : `${deps.length} selected`}
+          <span className='truncate text-[var(--text-tertiary)]'>
+            {deps.length === 0 ? 'Select at least one column' : `${deps.length} selected`}
           </span>
         }
       />
+      {error && <p className='pl-0.5 text-[var(--text-danger)] text-xs'>{error}</p>}
     </div>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/workflow-sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/workflow-sidebar.tsx
index fda9f87a13f..b339d3397ef 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/workflow-sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/workflow-sidebar/workflow-sidebar.tsx
@@ -241,31 +241,42 @@ function WorkflowSidebarBody({
       ? (allColumns.find((c) => c.name === config.columnName) ?? null)
       : null
 
-  // Anchor column for "left of current" filtering. For create + edit-group we
-  // treat the anchor as missing (group config sits at the right edge of the
-  // group); for edit-output the anchor is the column being edited.
-  const anchorColumnName = config.mode === 'edit-output' ? config.columnName : null
+  // Anchor index for "left of current" filtering.
+  //   - edit-output: the column being edited.
+  //   - edit-group: the leftmost column belonging to this group (deps must be
+  //     reachable from the group's first output column).
+  //   - create: no anchor; new column sits at the right edge, so every
+  //     existing column qualifies.
+  const anchorIdx = (() => {
+    if (config.mode === 'edit-output') {
+      const idx = allColumns.findIndex((c) => c.name === config.columnName)
+      return idx === -1 ? allColumns.length : idx
+    }
+    if (config.mode === 'edit-group' && existingGroup) {
+      let leftmost = Number.POSITIVE_INFINITY
+      for (let i = 0; i < allColumns.length; i++) {
+        if (allColumns[i].workflowGroupId === existingGroup.id && i < leftmost) leftmost = i
+      }
+      return Number.isFinite(leftmost) ? leftmost : allColumns.length
+    }
+    return allColumns.length
+  })()
 
   /**
    * Columns "left of current" — these are the only valid trigger dependencies.
-   * For create + edit-group, every existing column qualifies. For edit-output,
-   * only columns physically before the anchor.
    */
-  const otherColumns = (() => {
-    if (anchorColumnName === null) return allColumns
-    const idx = allColumns.findIndex((c) => c.name === anchorColumnName)
-    if (idx === -1) return allColumns.filter((c) => c.name !== anchorColumnName)
-    return allColumns.slice(0, idx)
-  })()
+  const otherColumns = anchorIdx >= allColumns.length ? allColumns : allColumns.slice(0, anchorIdx)
+
+  // Used by the "missing workflow input" suggestion below — for edit-output
+  // we exclude the column being edited (you can't suggest it as its own
+  // input).
+  const anchorColumnName = config.mode === 'edit-output' ? config.columnName : null
 
   // Every left-of-current column is a valid dep — workflow output columns
   // included. Exclude this group's own outputs (you can't depend on yourself).
   const ownOutputNames = new Set(existingGroup?.outputs.map((o) => o.columnName) ?? [])
   const depOptions = otherColumns.filter((c) => !ownOutputNames.has(c.name))
 
-  // Default deps for a brand-new group: tick every left-of-current column.
-  const defaultDeps = depOptions.map((c) => c.name)
-
   const [selectedWorkflowId, setSelectedWorkflowId] = useState<string>(
     () => existingGroup?.workflowId ?? ''
   )
@@ -276,9 +287,10 @@ function WorkflowSidebarBody({
   const [autoRun, setAutoRun] = useState<boolean>(() =>
     existingGroup ? existingGroup.autoRun !== false : false
   )
-  const [deps, setDeps] = useState<string[]>(
-    () => existingGroup?.dependencies?.columns ?? defaultDeps
-  )
+  // Deps default to none selected. With auto-run on, at least one is required
+  // (enforced via `depsValid` below); a legacy group with empty deps will
+  // surface the error on first open until the user picks at least one column.
+  const [deps, setDeps] = useState<string[]>(() => existingGroup?.dependencies?.columns ?? [])
   // `selectedOutputs` is encoded `${blockId}::${path}`. Seeded once `blockOutputGroups`
   // resolves (we may not have the workflow blocks loaded at first render); see the
   // post-load reconciliation below.
@@ -542,6 +554,7 @@ function WorkflowSidebarBody({
     if (!selectedWorkflowId) missing.push('a workflow')
     if (selectedWorkflowId && selectedOutputs.length === 0) missing.push('at least one output')
     if (isEditOutputMode && !trimmedName) missing.push('a column name')
+    if (autoRun && deps.length === 0) missing.push('at least one Run after column')
     if (missing.length > 0) {
       setShowValidation(true)
       return
@@ -664,8 +677,15 @@ function WorkflowSidebarBody({
     }
   }
 
+  // Auto-run requires ≥1 dependency column — without one, the dispatcher's
+  // eligibility predicate would never fire the workflow. Block Save and
+  // surface an inline error so the user picks a column.
+  const depsValid = !autoRun || deps.length > 0
   const saveDisabled =
-    addWorkflowGroup.isPending || updateWorkflowGroup.isPending || updateColumn.isPending
+    addWorkflowGroup.isPending ||
+    updateWorkflowGroup.isPending ||
+    updateColumn.isPending ||
+    !depsValid
   const titleByMode = {
     create: 'Add workflow',
     'edit-group': 'Configure workflow',
@@ -875,7 +895,12 @@ function WorkflowSidebarBody({
             {autoRun && (
               <>
                 <FieldDivider />
-                <RunSettingsSection depOptions={depOptions} deps={deps} onChangeDeps={setDeps} />
+                <RunSettingsSection
+                  depOptions={depOptions}
+                  deps={deps}
+                  onChangeDeps={setDeps}
+                  error={showValidation && deps.length === 0 ? 'Select at least one column' : null}
+                />
               </>
             )}
           </>
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts
index e5a0e5e807f..7c00d06e338 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts
@@ -3,9 +3,11 @@
 import { useEffect } from 'react'
 import { createLogger } from '@sim/logger'
 import { useQueryClient } from '@tanstack/react-query'
+import type { ActiveDispatch } from '@/lib/api/contracts/tables'
 import type { RowData, RowExecutionMetadata, RowExecutions } from '@/lib/table'
+import { isExecInFlight } from '@/lib/table/deps'
 import type { TableEvent, TableEventEntry } from '@/lib/table/events'
-import { snapshotAndMutateRows, tableKeys } from '@/hooks/queries/tables'
+import { snapshotAndMutateRows, type TableRunState, tableKeys } from '@/hooks/queries/tables'
 
 const logger = createLogger('useTableEventStream')
 
@@ -71,6 +73,28 @@ export function useTableEventStream({
     let lastEventId = loadPointer(tableId)
     let reconnectAttempt = 0
 
+    const updateRunStateCounters = (
+      rowId: string,
+      wasInFlight: boolean,
+      isInFlight: boolean
+    ): void => {
+      if (wasInFlight === isInFlight) return
+      const delta = isInFlight ? 1 : -1
+      queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
+        if (!prev) return prev
+        const prevForRow = prev.runningByRowId[rowId] ?? 0
+        const nextForRow = Math.max(0, prevForRow + delta)
+        const nextByRow = { ...prev.runningByRowId }
+        if (nextForRow === 0) delete nextByRow[rowId]
+        else nextByRow[rowId] = nextForRow
+        return {
+          ...prev,
+          runningCellCount: Math.max(0, prev.runningCellCount + delta),
+          runningByRowId: nextByRow,
+        }
+      })
+    }
+
     const applyCell = (event: Extract<TableEvent, { kind: 'cell' }>): void => {
       const {
         rowId,
@@ -83,12 +107,18 @@ export function useTableEventStream({
         runningBlockIds,
         blockErrors,
       } = event
+      let wasInFlight: boolean | null = null
       void snapshotAndMutateRows(
         queryClient,
         tableId,
         (row) => {
           if (row.id !== rowId) return null
           const prevExec = row.executions?.[groupId]
+          // In-flight = queued | running | pending. Server's countRunningCells
+          // counts all three (the gutter Run/Stop button reads this map and
+          // needs Stop visible during queued too, else clicking Play would
+          // re-enqueue a cell that's already queued).
+          if (wasInFlight === null) wasInFlight = isExecInFlight(prevExec)
           const nextExec: RowExecutionMetadata = {
             status,
             executionId: executionId ?? null,
@@ -108,11 +138,69 @@ export function useTableEventStream({
         },
         { cancelInFlight: false }
       )
+      if (wasInFlight === null) {
+        // Row outside the loaded page slice — can't compute the delta locally.
+        // Refetch the run-state snapshot from the server. Cheap and rare.
+        void queryClient.invalidateQueries({
+          queryKey: tableKeys.activeDispatches(tableId),
+        })
+      } else {
+        updateRunStateCounters(
+          rowId,
+          wasInFlight,
+          isExecInFlight({ status } as RowExecutionMetadata)
+        )
+      }
+    }
+
+    const applyDispatch = (event: Extract<TableEvent, { kind: 'dispatch' }>): void => {
+      const { dispatchId, status, scope, cursor, mode, isManualRun } = event
+      queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
+        // SSE may arrive before the initial fetch lands. Seed an empty
+        // run-state so the dispatch isn't dropped; counters are reconciled
+        // by the subsequent fetch / per-cell SSE events.
+        const base: TableRunState = prev ?? {
+          dispatches: [],
+          runningCellCount: 0,
+          runningByRowId: {},
+        }
+        const list = base.dispatches
+        // Terminal states drop the dispatch from the overlay; client renders
+        // the row's authoritative DB exec state from here.
+        if (status === 'complete' || status === 'cancelled') {
+          const filtered = list.filter((d) => d.id !== dispatchId)
+          return filtered.length === list.length ? base : { ...base, dispatches: filtered }
+        }
+        if (scope === undefined || cursor === undefined || mode === undefined) {
+          // Defensive: a legacy emit without the new fields can't drive the
+          // overlay. Leave existing cache alone.
+          return base
+        }
+        const idx = list.findIndex((d) => d.id === dispatchId)
+        const existing = idx === -1 ? undefined : list[idx]
+        // Prefer the event payload (current truth from server); fall back to
+        // the cached entry's value if this is a legacy emit without the
+        // field, and finally to `false` if we have nothing.
+        const resolvedManualRun = isManualRun ?? existing?.isManualRun ?? false
+        const next: ActiveDispatch = {
+          id: dispatchId,
+          status,
+          mode,
+          isManualRun: resolvedManualRun,
+          cursor,
+          scope,
+        }
+        if (idx === -1) return { ...base, dispatches: [...list, next] }
+        const merged = list.slice()
+        merged[idx] = next
+        return { ...base, dispatches: merged }
+      })
     }
 
     const handlePrune = (payload: PrunedEvent): void => {
       logger.info('Table event buffer pruned — full refetch', { tableId, ...payload })
       void queryClient.invalidateQueries({ queryKey: tableKeys.rowsRoot(tableId) })
+      void queryClient.invalidateQueries({ queryKey: tableKeys.activeDispatches(tableId) })
       lastEventId = typeof payload.earliestEventId === 'number' ? payload.earliestEventId : 0
       savePointer(tableId, lastEventId)
       // Close proactively so the server's close doesn't fire onerror and route
@@ -152,11 +240,11 @@ export function useTableEventStream({
       eventSource.onmessage = (msg: MessageEvent<string>) => {
         try {
           const entry = JSON.parse(msg.data) as TableEventEntry
-          if (entry.event?.kind !== 'cell') return
           if (entry.eventId <= lastEventId) return
           lastEventId = entry.eventId
           savePointer(tableId, lastEventId)
-          applyCell(entry.event)
+          if (entry.event?.kind === 'cell') applyCell(entry.event)
+          else if (entry.event?.kind === 'dispatch') applyDispatch(entry.event)
         } catch (err) {
           logger.warn('Failed to parse table event', { tableId, err })
         }
diff --git a/apps/sim/background/resume-execution.ts b/apps/sim/background/resume-execution.ts
index f7bd79d2a37..fa1ed60f595 100644
--- a/apps/sim/background/resume-execution.ts
+++ b/apps/sim/background/resume-execution.ts
@@ -1,6 +1,8 @@
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
 import { task } from '@trigger.dev/sdk'
+import { withCascadeLock } from '@/lib/table/cascade-lock'
 import type { RowData, RowExecutionMetadata } from '@/lib/table/types'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 
@@ -38,149 +40,65 @@ export async function executeResumeJob(payload: ResumeExecutionPayload) {
     // context so post-resume block outputs land on the same row + group as
     // the original cell task. Without this, blocks that run after the human
     // approves write nothing back to the table — the row silently truncates
-    // at the pause boundary. The original `parentExecutionId` is preserved
-    // on the cell's `executions[gid]` so it stays one logical execution
-    // across the pause/resume boundary.
+    // at the pause boundary.
     const { findCellContextByExecutionId } = await import('@/lib/table/workflow-columns')
     const cellContext = await findCellContextByExecutionId(parentExecutionId)
 
-    let cellOnBlockComplete: ((blockId: string, output: unknown) => Promise<void>) | undefined
-    let writeCellTerminal:
-      | ((status: 'completed' | 'error' | 'paused', error: string | null) => Promise<void>)
-      | undefined
+    const writers = cellContext
+      ? await buildResumeCellWriters(cellContext, parentExecutionId)
+      : null
 
-    if (cellContext) {
-      const { getTableById } = await import('@/lib/table/service')
-      const { writeWorkflowGroupState, buildOutputsByBlockId } = await import(
-        '@/lib/table/cell-write'
-      )
-      const { pluckByPath } = await import('@/lib/table/pluck')
-
-      const table = await getTableById(cellContext.tableId)
-      const group = table?.schema.workflowGroups?.find((g) => g.id === cellContext.groupId)
-      if (group) {
-        const outputsByBlockId = buildOutputsByBlockId(group)
-        const accumulatedData: RowData = {}
-        const blockErrors: Record<string, string> = {}
-        const writeCtx = {
-          tableId: cellContext.tableId,
-          rowId: cellContext.rowId,
-          workspaceId: cellContext.workspaceId,
-          groupId: cellContext.groupId,
-          executionId: parentExecutionId,
-          requestId: `wfgrp-resume-${parentExecutionId}`,
-        }
-        let writeChain: Promise<void> = Promise.resolve()
-        let terminalWritten = false
-
-        cellOnBlockComplete = async (blockId, output) => {
-          const outputs = outputsByBlockId.get(blockId)
-          if (!outputs) return
-          const blockResult =
-            output && typeof output === 'object' && 'output' in (output as object)
-              ? (output as { output: unknown }).output
-              : output
-          const errorMessage =
-            blockResult &&
-            typeof blockResult === 'object' &&
-            typeof (blockResult as { error?: unknown }).error === 'string'
-              ? (blockResult as { error: string }).error
-              : null
-          if (errorMessage) {
-            blockErrors[blockId] = errorMessage
-          } else {
-            for (const out of outputs) {
-              const plucked = pluckByPath(blockResult, out.path)
-              if (plucked === undefined) continue
-              accumulatedData[out.columnName] = plucked as RowData[string]
-            }
-          }
-          const dataSnapshot: RowData = { ...accumulatedData }
-          const blockErrorsSnapshot = { ...blockErrors }
-          writeChain = writeChain
-            .then(async () => {
-              if (terminalWritten) return
-              const partial: RowExecutionMetadata = {
-                status: 'running',
-                executionId: parentExecutionId,
-                jobId: null,
-                workflowId: cellContext.workflowId,
-                error: null,
-                blockErrors: blockErrorsSnapshot,
-              }
-              await writeWorkflowGroupState(writeCtx, {
-                executionState: partial,
-                dataPatch: dataSnapshot,
-              })
-            })
-            .catch((err) => {
-              logger.warn(
-                `Resume per-block partial write failed (table=${cellContext.tableId} row=${cellContext.rowId} group=${cellContext.groupId}):`,
-                err
-              )
-            })
-        }
-
-        writeCellTerminal = async (status, error) => {
-          terminalWritten = true
-          await writeChain.catch(() => {})
-          // Paused → keep `pending` + sentinel jobId so eligibility predicates
-          // continue treating the row as in-flight while we wait on another
-          // pause. Mirrors the initial cell-task pause branch.
-          const terminal: RowExecutionMetadata =
-            status === 'paused'
-              ? {
-                  status: 'pending',
-                  executionId: parentExecutionId,
-                  jobId: `paused-${parentExecutionId}`,
-                  workflowId: cellContext.workflowId,
-                  error: null,
-                  blockErrors,
-                }
-              : {
-                  status,
-                  executionId: parentExecutionId,
-                  jobId: null,
-                  workflowId: cellContext.workflowId,
-                  error,
-                  runningBlockIds: [],
-                  blockErrors,
-                }
-          await writeWorkflowGroupState(writeCtx, {
-            executionState: terminal,
-            dataPatch: accumulatedData,
-          })
-        }
-      } else {
-        logger.warn(
-          'Cell context found but table or group missing — falling back to plain resume',
-          {
-            parentExecutionId,
-            tableId: cellContext.tableId,
-            groupId: cellContext.groupId,
-          }
-        )
+    // No cell context → plain resume, no lock, no cascade continuation.
+    if (!cellContext || !writers) {
+      const result = await PauseResumeManager.startResumeExecution({
+        resumeEntryId: payload.resumeEntryId,
+        resumeExecutionId: payload.resumeExecutionId,
+        pausedExecution,
+        contextId: payload.contextId,
+        resumeInput: payload.resumeInput,
+        userId: payload.userId,
+      })
+      logger.info('Background resume execution completed', {
+        resumeExecutionId,
+        workflowId,
+        success: result.success,
+        status: result.status,
+      })
+      return {
+        success: result.success,
+        workflowId,
+        executionId: resumeExecutionId,
+        parentExecutionId,
+        status: result.status,
+        output: result.output,
+        executedAt: new Date().toISOString(),
       }
     }
 
-    const result = await PauseResumeManager.startResumeExecution({
-      resumeEntryId: payload.resumeEntryId,
-      resumeExecutionId: payload.resumeExecutionId,
-      pausedExecution,
-      contextId: payload.contextId,
-      resumeInput: payload.resumeInput,
-      userId: payload.userId,
-      ...(cellOnBlockComplete ? { onBlockComplete: cellOnBlockComplete } : {}),
-    })
-
-    if (writeCellTerminal) {
-      if (result.status === 'paused') {
-        await writeCellTerminal('paused', null)
-      } else if (result.success) {
-        await writeCellTerminal('completed', null)
-      } else {
-        await writeCellTerminal('error', result.error ?? 'Workflow execution failed')
+    // Cell-context path: hold the row's cascade lock for the resume + any
+    // downstream cascade continuation. On lock contention, fall through to
+    // resume-only (the lock holder will pick up the resumed group's
+    // completion on its next eligibility scan).
+    const outcome = await withCascadeLock(
+      cellContext.tableId,
+      cellContext.rowId,
+      parentExecutionId,
+      async () => {
+        const result = await runResumeAndCellTerminal(payload, pausedExecution, writers)
+        if (result.status === 'paused') return result
+        await continueCascadeAfterResume(cellContext)
+        return result
       }
+    )
+
+    let result
+    if (outcome.status === 'contended') {
+      logger.info(
+        `Resume cascade lock held — writing resumed group only (table=${cellContext.tableId} row=${cellContext.rowId} executionId=${parentExecutionId})`
+      )
+      result = await runResumeAndCellTerminal(payload, pausedExecution, writers)
+    } else {
+      result = outcome.result
     }
 
     logger.info('Background resume execution completed', {
@@ -209,6 +127,192 @@ export async function executeResumeJob(payload: ResumeExecutionPayload) {
   }
 }
 
+type CellWriters = {
+  cellOnBlockComplete: (blockId: string, output: unknown) => Promise<void>
+  writeCellTerminal: (
+    status: 'completed' | 'error' | 'paused',
+    error: string | null
+  ) => Promise<void>
+}
+
+async function buildResumeCellWriters(
+  cellContext: {
+    tableId: string
+    rowId: string
+    workspaceId: string
+    groupId: string
+    workflowId: string
+  },
+  parentExecutionId: string
+): Promise<CellWriters | null> {
+  const { getTableById } = await import('@/lib/table/service')
+  const { writeWorkflowGroupState, buildOutputsByBlockId } = await import('@/lib/table/cell-write')
+  const { pluckByPath } = await import('@/lib/table/pluck')
+
+  const table = await getTableById(cellContext.tableId)
+  const group = table?.schema.workflowGroups?.find((g) => g.id === cellContext.groupId)
+  if (!group) {
+    logger.warn('Cell context found but table or group missing — falling back to plain resume', {
+      parentExecutionId,
+      tableId: cellContext.tableId,
+      groupId: cellContext.groupId,
+    })
+    return null
+  }
+
+  const outputsByBlockId = buildOutputsByBlockId(group)
+  const accumulatedData: RowData = {}
+  const blockErrors: Record<string, string> = {}
+  const writeCtx = {
+    tableId: cellContext.tableId,
+    rowId: cellContext.rowId,
+    workspaceId: cellContext.workspaceId,
+    groupId: cellContext.groupId,
+    executionId: parentExecutionId,
+    requestId: `wfgrp-resume-${parentExecutionId}`,
+  }
+  let writeChain: Promise<void> = Promise.resolve()
+  let terminalWritten = false
+
+  const cellOnBlockComplete = async (blockId: string, output: unknown) => {
+    const outputs = outputsByBlockId.get(blockId)
+    if (!outputs) return
+    const blockResult =
+      output && typeof output === 'object' && 'output' in (output as object)
+        ? (output as { output: unknown }).output
+        : output
+    const errorMessage =
+      blockResult &&
+      typeof blockResult === 'object' &&
+      typeof (blockResult as { error?: unknown }).error === 'string'
+        ? (blockResult as { error: string }).error
+        : null
+    if (errorMessage) {
+      blockErrors[blockId] = errorMessage
+    } else {
+      for (const out of outputs) {
+        const plucked = pluckByPath(blockResult, out.path)
+        if (plucked === undefined) continue
+        accumulatedData[out.columnName] = plucked as RowData[string]
+      }
+    }
+    const dataSnapshot: RowData = { ...accumulatedData }
+    const blockErrorsSnapshot = { ...blockErrors }
+    writeChain = writeChain
+      .then(async () => {
+        if (terminalWritten) return
+        const partial: RowExecutionMetadata = {
+          status: 'running',
+          executionId: parentExecutionId,
+          jobId: null,
+          workflowId: cellContext.workflowId,
+          error: null,
+          blockErrors: blockErrorsSnapshot,
+        }
+        await writeWorkflowGroupState(writeCtx, {
+          executionState: partial,
+          dataPatch: dataSnapshot,
+        })
+      })
+      .catch((err) => {
+        logger.warn(
+          `Resume per-block partial write failed (table=${cellContext.tableId} row=${cellContext.rowId} group=${cellContext.groupId}):`,
+          err
+        )
+      })
+  }
+
+  const writeCellTerminal = async (
+    status: 'completed' | 'error' | 'paused',
+    error: string | null
+  ) => {
+    terminalWritten = true
+    await writeChain.catch(() => {})
+    // Paused → keep `pending` + sentinel jobId so eligibility predicates
+    // continue treating the row as in-flight while we wait on another
+    // pause. Mirrors the initial cell-task pause branch.
+    const terminal: RowExecutionMetadata =
+      status === 'paused'
+        ? {
+            status: 'pending',
+            executionId: parentExecutionId,
+            jobId: `paused-${parentExecutionId}`,
+            workflowId: cellContext.workflowId,
+            error: null,
+            blockErrors,
+          }
+        : {
+            status,
+            executionId: parentExecutionId,
+            jobId: null,
+            workflowId: cellContext.workflowId,
+            error,
+            runningBlockIds: [],
+            blockErrors,
+          }
+    await writeWorkflowGroupState(writeCtx, {
+      executionState: terminal,
+      dataPatch: accumulatedData,
+    })
+  }
+
+  return { cellOnBlockComplete, writeCellTerminal }
+}
+
+async function runResumeAndCellTerminal(
+  payload: ResumeExecutionPayload,
+  pausedExecution: Awaited<ReturnType<typeof PauseResumeManager.getPausedExecutionById>>,
+  writers: CellWriters
+): Promise<Awaited<ReturnType<typeof PauseResumeManager.startResumeExecution>>> {
+  if (!pausedExecution) throw new Error('Paused execution missing — already nulled by caller')
+  const result = await PauseResumeManager.startResumeExecution({
+    resumeEntryId: payload.resumeEntryId,
+    resumeExecutionId: payload.resumeExecutionId,
+    pausedExecution,
+    contextId: payload.contextId,
+    resumeInput: payload.resumeInput,
+    userId: payload.userId,
+    onBlockComplete: writers.cellOnBlockComplete,
+  })
+
+  if (result.status === 'paused') {
+    await writers.writeCellTerminal('paused', null)
+  } else if (result.success) {
+    await writers.writeCellTerminal('completed', null)
+  } else {
+    await writers.writeCellTerminal('error', result.error ?? 'Workflow execution failed')
+  }
+
+  return result
+}
+
+async function continueCascadeAfterResume(cellContext: {
+  tableId: string
+  rowId: string
+  workspaceId: string
+  groupId: string
+}): Promise<void> {
+  const { getTableById, getRowById } = await import('@/lib/table/service')
+  const { pickNextEligibleGroupForRow } = await import('@/lib/table/workflow-columns')
+  const { runRowCascadeLoop } = await import('@/background/workflow-column-execution')
+
+  const freshTable = await getTableById(cellContext.tableId)
+  if (!freshTable) return
+  const freshRow = await getRowById(cellContext.tableId, cellContext.rowId, cellContext.workspaceId)
+  if (!freshRow) return
+  const next = pickNextEligibleGroupForRow(freshTable, freshRow, cellContext.groupId)
+  if (!next) return
+  await runRowCascadeLoop({
+    tableId: cellContext.tableId,
+    tableName: freshTable.name,
+    rowId: cellContext.rowId,
+    workspaceId: cellContext.workspaceId,
+    groupId: next.id,
+    workflowId: next.workflowId,
+    executionId: generateId(),
+  })
+}
+
 export const resumeExecutionTask = task({
   id: 'resume-execution',
   machine: 'medium-1x',
diff --git a/apps/sim/background/table-run-dispatcher.ts b/apps/sim/background/table-run-dispatcher.ts
new file mode 100644
index 00000000000..441348b8acb
--- /dev/null
+++ b/apps/sim/background/table-run-dispatcher.ts
@@ -0,0 +1,37 @@
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { task } from '@trigger.dev/sdk'
+import { runDispatcherToCompletion } from '@/lib/table/dispatcher'
+
+const logger = createLogger('TableRunDispatcherTask')
+
+export interface TableRunDispatcherPayload {
+  dispatchId: string
+}
+
+/**
+ * Trigger.dev wrapper around `dispatcherStep`. One task run holds the
+ * dispatcher loop for the dispatch's entire lifetime — each iteration
+ * processes a window of cells via `batchTriggerAndWait`, which checkpoints
+ * the parent via CRIU during the wait so we don't pay compute while cells
+ * execute. The cursor is persisted in DB; if this run crashes, trigger.dev
+ * retries and the next attempt resumes from the persisted cursor.
+ */
+export const tableRunDispatcherTask = task({
+  id: 'table-run-dispatcher',
+  machine: 'small-1x',
+  retry: { maxAttempts: 3 },
+  queue: {
+    name: 'table-run-dispatcher',
+    concurrencyLimit: 8,
+  },
+  run: async (payload: TableRunDispatcherPayload) => {
+    const { dispatchId } = payload
+    try {
+      await runDispatcherToCompletion(dispatchId)
+    } catch (err) {
+      logger.error(`[${dispatchId}] dispatcher loop failed`, { error: toError(err).message })
+      throw err
+    }
+  },
+})
diff --git a/apps/sim/background/workflow-column-execution.ts b/apps/sim/background/workflow-column-execution.ts
index 7c4b977d537..9c62ee21cae 100644
--- a/apps/sim/background/workflow-column-execution.ts
+++ b/apps/sim/background/workflow-column-execution.ts
@@ -2,38 +2,108 @@ import { db } from '@sim/db'
 import { workflow as workflowTable } from '@sim/db/schema'
 import { createLogger, runWithRequestContext } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
 import { task } from '@trigger.dev/sdk'
 import { eq } from 'drizzle-orm'
-import type { RowData, RowExecutionMetadata } from '@/lib/table/types'
+import { withCascadeLock } from '@/lib/table/cascade-lock'
+import type {
+  RowData,
+  RowExecutionMetadata,
+  TableDefinition,
+  WorkflowGroup,
+} from '@/lib/table/types'
+import type { WorkflowGroupCellPayload } from '@/lib/table/workflow-columns'
 
-const logger = createLogger('TriggerWorkflowGroupCell')
+export type { WorkflowGroupCellPayload }
 
-export type WorkflowGroupCellPayload = {
-  tableId: string
-  tableName: string
-  rowId: string
-  groupId: string
-  workflowId: string
-  workspaceId: string
-  /** Sim-side correlation id used as `wfgrp-${executionId}` in logs/requestId. */
-  executionId: string
-}
+const logger = createLogger('TriggerWorkflowGroupCell')
 
-/**
- * Background workflow-group cell execution. Runs in a trigger.dev worker;
- * writes plain primitives into `row.data[output.columnName]` as picked
- * blocks complete, and execution state into `row.executions[groupId]`.
- * Cancellation is authoritative via `cancelWorkflowGroupRuns`.
- */
+/** Cell-task entrypoint. Holds a per-row cascade lock so only one worker
+ *  advances a given row at a time; bails on contention. The held lock heart-
+ *  beats every 10s so a crashed pod releases within ~30s. */
 export async function executeWorkflowGroupCellJob(
   payload: WorkflowGroupCellPayload,
   signal?: AbortSignal
 ) {
+  const { tableId, rowId, executionId } = payload
+  const outcome = await withCascadeLock(tableId, rowId, executionId, () =>
+    runRowCascadeLoop(payload, signal)
+  )
+  if (outcome.status === 'contended') {
+    logger.info(
+      `Cascade lock held — bailing (table=${tableId} row=${rowId} executionId=${executionId})`
+    )
+  }
+}
+
+/** Re-fetches the table schema each iteration so groups added DURING the
+ *  cascade become visible to the eligibility check. The resume worker must
+ *  already hold the row's cascade lock before calling. */
+export async function runRowCascadeLoop(
+  payload: WorkflowGroupCellPayload,
+  signal?: AbortSignal
+): Promise<void> {
+  const { tableId, rowId, workspaceId } = payload
+  const { getTableById, getRowById } = await import('@/lib/table/service')
+  const { pickNextEligibleGroupForRow } = await import('@/lib/table/workflow-columns')
+
+  let currentGroupId = payload.groupId
+  let currentWorkflowId = payload.workflowId
+  // Fresh executionId per iteration: SQL guard rejects writes whose id ≠
+  // row.executions[gid].executionId, so we need a new claim per group.
+  let currentExecutionId = payload.executionId
+
+  while (true) {
+    if (signal?.aborted) break
+
+    const freshTable = await getTableById(tableId)
+    if (!freshTable) {
+      logger.warn(`Table ${tableId} vanished mid-cascade`)
+      break
+    }
+    const currentGroup = freshTable.schema.workflowGroups?.find((g) => g.id === currentGroupId)
+    if (!currentGroup) {
+      logger.warn(`Group ${currentGroupId} no longer exists on table ${tableId}`)
+      break
+    }
+
+    const result = await runWorkflowAndWriteTerminal(
+      {
+        ...payload,
+        groupId: currentGroupId,
+        workflowId: currentWorkflowId,
+        executionId: currentExecutionId,
+      },
+      signal,
+      freshTable,
+      currentGroup
+    )
+
+    if (result === 'paused') break
+
+    const freshRow = await getRowById(tableId, rowId, workspaceId)
+    if (!freshRow) break
+    const next = pickNextEligibleGroupForRow(freshTable, freshRow, currentGroupId)
+    if (!next) break
+    currentGroupId = next.id
+    currentWorkflowId = next.workflowId
+    currentExecutionId = generateId()
+  }
+}
+
+/** Returns `'paused'` to signal the cascade loop must exit (resume worker
+ *  takes over). `'completed' | 'error'` keep the loop running. */
+async function runWorkflowAndWriteTerminal(
+  payload: WorkflowGroupCellPayload,
+  signal: AbortSignal | undefined,
+  table: TableDefinition,
+  group: WorkflowGroup
+): Promise<'completed' | 'error' | 'paused'> {
   const { tableId, tableName, rowId, groupId, workflowId, workspaceId, executionId } = payload
   const requestId = `wfgrp-${executionId}`
 
   return runWithRequestContext({ requestId }, async () => {
-    const { getTableById, getRowById, updateRow } = await import('@/lib/table/service')
+    const { getRowById } = await import('@/lib/table/service')
     const { executeWorkflow } = await import('@/lib/workflows/executor/execute-workflow')
     const { loadWorkflowFromNormalizedTables } = await import('@/lib/workflows/persistence/utils')
     const { writeWorkflowGroupState, markWorkflowGroupPickedUp, buildOutputsByBlockId } =
@@ -44,36 +114,11 @@ export async function executeWorkflowGroupCellJob(
     const writeState = (executionState: RowExecutionMetadata, dataPatch?: RowData) =>
       writeWorkflowGroupState(cellCtx, { executionState, dataPatch })
 
-    // Hoisted out of the try so the catch block can drain pending writes and
-    // surface partial errors in the terminal-error state.
     const blockErrors: Record<string, string> = {}
     let writeChain: Promise<void> = Promise.resolve()
-    // Set right before the terminal `completed`/`error` write fires. The
-    // executor fires `onBlockComplete` callbacks fire-and-forget, so some can
-    // still be in the microtask queue after `executeWorkflow` resolves; they
-    // would otherwise enqueue a `running` partial-write that lands after the
-    // terminal state and clobber it. Once this flag is set, `schedulePartialWrite`
-    // becomes a no-op.
     let terminalWritten = false
 
     try {
-      const table = await getTableById(tableId)
-      if (!table) {
-        logger.warn(`Table ${tableId} vanished before execution`)
-        return
-      }
-      const group = (table.schema.workflowGroups ?? []).find((g) => g.id === groupId)
-      if (!group) {
-        await writeState({
-          status: 'error',
-          executionId,
-          jobId: null,
-          workflowId,
-          error: `Workflow group ${groupId} no longer exists on this table`,
-        })
-        return
-      }
-
       const [workflowRecord] = await db
         .select()
         .from(workflowTable)
@@ -88,7 +133,7 @@ export async function executeWorkflowGroupCellJob(
           workflowId,
           error: 'Workflow not found',
         })
-        return
+        return 'error'
       }
 
       const normalizedData = await loadWorkflowFromNormalizedTables(workflowId)
@@ -103,24 +148,22 @@ export async function executeWorkflowGroupCellJob(
           workflowId,
           error: 'Workflow is missing a Start trigger',
         })
-        return
+        return 'error'
       }
 
       const row = await getRowById(tableId, rowId, workspaceId)
       if (!row) {
         logger.warn(`Row ${rowId} vanished before execution`)
-        return
+        return 'error'
       }
 
-      // Flip `queued` → `running` to signal the worker has actually started.
-      // Bail out if the cancel-sticky guard rejects the write (a stop click
-      // landed between enqueue and pickup).
-      const queuedExec = row.executions?.[groupId] as RowExecutionMetadata | undefined
+      // SQL guard rejects if a stop click stamped `cancelled` between enqueue
+      // and pickup.
       const pickedUp = await markWorkflowGroupPickedUp(cellCtx, {
         workflowId,
-        jobId: queuedExec?.jobId ?? null,
+        jobId: null,
       })
-      if (pickedUp === 'skipped') return
+      if (pickedUp === 'skipped') return 'error'
 
       // Output columns produced by THIS group are skipped on input — they're
       // populated by the run we're starting. Other group's outputs ARE
@@ -137,8 +180,6 @@ export async function executeWorkflowGroupCellJob(
         .filter((c) => !ownOutputColumns.has(c.name))
         .map((c) => c.name)
 
-      // Spread row columns as top-level inputs so Start block fields resolve
-      // directly by column name; reserved metadata keys win on collision.
       const input = {
         ...inputRow,
         row: inputRow,
@@ -156,11 +197,9 @@ export async function executeWorkflowGroupCellJob(
       const { pluckByPath } = await import('@/lib/table/pluck')
       const outputsByBlockId = buildOutputsByBlockId(group)
 
-      // Local accumulators for the run.
       const accumulatedData: RowData = {}
       const runningBlockIds = new Set<string>()
 
-      /** Snapshot the current state and append a partial write to the chain. */
       const schedulePartialWrite = () => {
         if (terminalWritten) return
         const dataSnapshot: RowData = { ...accumulatedData }
@@ -169,18 +208,12 @@ export async function executeWorkflowGroupCellJob(
         writeChain = writeChain
           .then(async () => {
             if (signal?.aborted) return
-            // Re-check inside the chain — a write enqueued before the
-            // terminal flag flipped should still bail if the chain runs
-            // after the terminal write.
             if (terminalWritten) return
             await writeState(
               {
                 status: 'running',
                 executionId,
-                // Stamp the jobId from the current row state — the scheduler
-                // wrote it before this task started, and we don't want to lose
-                // it on partial writes. Re-read defensively.
-                jobId: await readJobId(),
+                jobId: null,
                 workflowId,
                 error: null,
                 runningBlockIds: runningSnapshot,
@@ -197,12 +230,6 @@ export async function executeWorkflowGroupCellJob(
           })
       }
 
-      const readJobId = async (): Promise<string | null> => {
-        const r = await getRowById(tableId, rowId, workspaceId)
-        const exec = r?.executions?.[groupId] as RowExecutionMetadata | undefined
-        return exec?.jobId ?? null
-      }
-
       const onBlockStart = async (blockId: string): Promise<void> => {
         if (!outputsByBlockId.has(blockId)) return
         runningBlockIds.add(blockId)
@@ -213,7 +240,6 @@ export async function executeWorkflowGroupCellJob(
         const outputs = outputsByBlockId.get(blockId)
         if (!outputs) return
 
-        // executor hands us `{ input?, output: NormalizedBlockOutput, executionTime, ... }`
         const blockResult =
           output && typeof output === 'object' && 'output' in (output as object)
             ? (output as { output: unknown }).output
@@ -231,9 +257,6 @@ export async function executeWorkflowGroupCellJob(
         } else {
           for (const out of outputs) {
             const plucked = pluckByPath(blockResult, out.path)
-            // Skip when pluck misses — assigning `undefined` would drop the
-            // key on JSON serialization, clearing any prior value already
-            // landed for this column.
             if (plucked === undefined) continue
             accumulatedData[out.columnName] = plucked as RowData[string]
           }
@@ -257,10 +280,6 @@ export async function executeWorkflowGroupCellJob(
           executionMode: 'sync',
           workflowTriggerType: 'table',
           triggerBlockId: startBlock.id,
-          // Always run the live workflow state — table cells track the
-          // current editor state rather than the most recent deploy, so
-          // every save lands in the next row run without forcing the user
-          // to re-deploy.
           useDraftState: true,
           abortSignal: signal,
           onBlockStart,
@@ -269,20 +288,10 @@ export async function executeWorkflowGroupCellJob(
         executionId
       )
 
-      // Drain queued partial writes before the terminal write so a late
-      // `running` partial doesn't clobber it. Setting `terminalWritten`
-      // before draining means any onBlockComplete callbacks still in the
-      // microtask queue (the executor fires them fire-and-forget) become
-      // no-ops the moment they try to enqueue.
       terminalWritten = true
       await writeChain.catch(() => {})
 
       if (result.status === 'paused') {
-        // HITL pause: keep the row in `pending` so the renderer surfaces it
-        // the same way logs do, but stamp a sentinel jobId so the scheduler's
-        // eligibility predicate keeps treating the row as in-flight (no
-        // re-enqueue while we wait on a human). Resume worker rewrites this
-        // back to `completed`/`error` once the pause clears.
         await writeState(
           {
             status: 'pending',
@@ -304,7 +313,7 @@ export async function executeWorkflowGroupCellJob(
           workflowId,
           workspaceId,
         })
-        return
+        return 'paused'
       }
 
       await writeState(
@@ -319,16 +328,13 @@ export async function executeWorkflowGroupCellJob(
         },
         accumulatedData
       )
+      return result.success ? 'completed' : 'error'
     } catch (err) {
       const message = toError(err).message
       logger.error(
         `Workflow group cell execution failed (table=${tableId} row=${rowId} group=${groupId})`,
         { error: message, executionId }
       )
-      // Drain queued partial writes before the terminal error write so a late
-      // `running` partial doesn't clobber it — same reason as the success
-      // path above. Reset `runningBlockIds`/`blockErrors` explicitly so the
-      // renderer sees a clean terminal state (otherwise stale spinners stay).
       terminalWritten = true
       await writeChain.catch(() => {})
       try {
@@ -344,6 +350,7 @@ export async function executeWorkflowGroupCellJob(
       } catch (writeErr) {
         logger.error('Also failed to write error state', { error: toError(writeErr).message })
       }
+      return 'error'
     }
   })
 }
diff --git a/apps/sim/hooks/queries/tables.ts b/apps/sim/hooks/queries/tables.ts
index 9d1f6993cdb..90ba8777a7b 100644
--- a/apps/sim/hooks/queries/tables.ts
+++ b/apps/sim/hooks/queries/tables.ts
@@ -19,6 +19,7 @@ import { isValidationError } from '@/lib/api/client/errors'
 import { requestJson } from '@/lib/api/client/request'
 import type { ContractJsonResponse } from '@/lib/api/contracts'
 import {
+  type ActiveDispatch,
   type AddWorkflowGroupBodyInput,
   addTableColumnContract,
   addWorkflowGroupContract,
@@ -38,6 +39,7 @@ import {
   deleteWorkflowGroupContract,
   getTableContract,
   type InsertTableRowBodyInput,
+  listActiveDispatchesContract,
   listTableRowsContract,
   listTablesContract,
   type RunMode,
@@ -69,7 +71,12 @@ import type {
   WorkflowGroupDependencies,
   WorkflowGroupOutput,
 } from '@/lib/table'
-import { areOutputsFilled, optimisticallyScheduleNewlyEligibleGroups } from '@/lib/table/deps'
+import {
+  areGroupDepsSatisfied,
+  areOutputsFilled,
+  isExecInFlight,
+  optimisticallyScheduleNewlyEligibleGroups,
+} from '@/lib/table/deps'
 
 const logger = createLogger('TableQueries')
 
@@ -86,6 +93,8 @@ export const tableKeys = {
   infiniteRows: (tableId: string, paramsKey: string) =>
     [...tableKeys.rowsRoot(tableId), 'infinite', paramsKey] as const,
   rowWrites: (tableId: string) => [...tableKeys.rowsRoot(tableId), 'write'] as const,
+  activeDispatches: (tableId: string) =>
+    [...tableKeys.detail(tableId), 'active-dispatches'] as const,
 }
 
 type TableRowsParams = Omit<TableRowsQueryInput, 'filter' | 'sort'> &
@@ -153,10 +162,6 @@ async function fetchTableRows({
   return { rows, totalCount }
 }
 
-function invalidateRowData(queryClient: ReturnType<typeof useQueryClient>, tableId: string) {
-  queryClient.invalidateQueries({ queryKey: tableKeys.rowsRoot(tableId) })
-}
-
 function invalidateRowCount(queryClient: ReturnType<typeof useQueryClient>, tableId: string) {
   queryClient.invalidateQueries({ queryKey: tableKeys.rowsRoot(tableId) })
   queryClient.invalidateQueries({ queryKey: tableKeys.detail(tableId) })
@@ -202,6 +207,40 @@ export function useTable(workspaceId: string | undefined, tableId: string | unde
   })
 }
 
+export interface TableRunState {
+  dispatches: ActiveDispatch[]
+  runningCellCount: number
+  runningByRowId: Record<string, number>
+}
+
+async function fetchTableRunState(tableId: string, signal?: AbortSignal): Promise<TableRunState> {
+  const response = await requestJson(listActiveDispatchesContract, {
+    params: { tableId },
+    signal,
+  })
+  return {
+    dispatches: response.data.dispatches,
+    runningCellCount: response.data.runningCellCount,
+    runningByRowId: response.data.runningByRowId,
+  }
+}
+
+/**
+ * Aggregate live state for a table: active dispatches (drives the "about to
+ * run" overlay), the running-cell count (top-right counter), and per-row
+ * running counts (per-row badge). Bootstrap snapshot fetched once on mount;
+ * SSE `kind: 'cell'` and `kind: 'dispatch'` events incrementally update the
+ * same cache.
+ */
+export function useTableRunState(tableId: string | undefined) {
+  return useQuery({
+    queryKey: tableKeys.activeDispatches(tableId ?? ''),
+    queryFn: ({ signal }) => fetchTableRunState(tableId as string, signal),
+    enabled: Boolean(tableId),
+    staleTime: 30 * 1000,
+  })
+}
+
 interface InfiniteTableRowsParams {
   workspaceId: string
   tableId: string
@@ -409,7 +448,11 @@ export function useCreateTableRow({ workspaceId, tableId }: RowMutationContext)
       const row = response.data.row
       if (!row) return
 
-      reconcileCreatedRow(queryClient, tableId, row)
+      const groups =
+        queryClient.getQueryData<TableDefinition>(tableKeys.detail(tableId))?.schema
+          .workflowGroups ?? []
+      const stamped = withOptimisticAutoFireExec(groups, row)
+      reconcileCreatedRow(queryClient, tableId, stamped)
     },
     onError: (error) => {
       if (isValidationError(error)) return
@@ -421,6 +464,19 @@ export function useCreateTableRow({ workspaceId, tableId }: RowMutationContext)
   })
 }
 
+/**
+ * Pre-stamp `pending` for any auto-fire-eligible workflow groups on a row that
+ * was just inserted server-side. Mirrors the server's `mode: 'new'` dispatch:
+ * the server will fire these groups in the background; the optimistic stamp
+ * shows the user a `queued` badge immediately rather than waiting ~1s for the
+ * first SSE event.
+ */
+function withOptimisticAutoFireExec(groups: WorkflowGroup[], row: TableRow): TableRow {
+  const nextExecutions = optimisticallyScheduleNewlyEligibleGroups(groups, row, {})
+  if (!nextExecutions) return row
+  return { ...row, executions: nextExecutions }
+}
+
 /**
  * Apply a row-level transformation to all cached infinite row queries for this
  * table. Used for cell edits where positions don't change.
@@ -602,11 +658,6 @@ export function useUpdateTableRow({ workspaceId, tableId }: RowMutationContext)
       if (isValidationError(error)) return
       toast.error(error.message, { duration: 5000 })
     },
-    onSettled: () => {
-      if (queryClient.isMutating({ mutationKey: tableKeys.rowWrites(tableId) }) === 1) {
-        invalidateRowData(queryClient, tableId)
-      }
-    },
   })
 }
 
@@ -666,11 +717,6 @@ export function useBatchUpdateTableRows({ workspaceId, tableId }: RowMutationCon
       if (isValidationError(error)) return
       toast.error(error.message, { duration: 5000 })
     },
-    onSettled: () => {
-      if (queryClient.isMutating({ mutationKey: tableKeys.rowWrites(tableId) }) === 1) {
-        invalidateRowData(queryClient, tableId)
-      }
-    },
   })
 }
 
@@ -869,13 +915,19 @@ export function useCancelTableRuns({ workspaceId, tableId }: RowMutationContext)
         const nextExecutions: RowExecutions = { ...executions }
         for (const gid in executions) {
           const exec = executions[gid]
-          if (!isOptimisticInFlight(exec)) continue
-          // Preserve blockErrors so cells that already errored keep their
-          // Error rendering after the stop — only cells without a value or
-          // error should flip to "Cancelled".
+          if (!isExecInFlight(exec)) continue
+          if (exec.executionId == null) {
+            // Optimistic-only or dispatcher-pre-stamp pending — server has not
+            // claimed the cell yet, so no SSE will arrive to reconcile a
+            // `cancelled` stamp. Strip the entry instead and let the renderer
+            // fall through to the cell's prior state (value / empty / etc.).
+            delete nextExecutions[gid]
+            rowTouched = true
+            continue
+          }
           nextExecutions[gid] = {
             status: 'cancelled',
-            executionId: exec.executionId ?? null,
+            executionId: exec.executionId,
             jobId: null,
             workflowId: exec.workflowId,
             error: 'Cancelled',
@@ -892,6 +944,11 @@ export function useCancelTableRuns({ workspaceId, tableId }: RowMutationContext)
     },
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: tableKeys.rowsRoot(tableId) })
+      // Refetch the run-state snapshot — server re-derives runningCellCount +
+      // runningByRowId from the freshly-updated sidecar via countRunningCells.
+      // Without this, the counter and row gutter button stay stale until the
+      // user refetches manually.
+      queryClient.invalidateQueries({ queryKey: tableKeys.activeDispatches(tableId) })
     },
   })
 }
@@ -1251,14 +1308,6 @@ function buildPendingExec(
   }
 }
 
-/** Broader sibling of `isExecInFlight` from `lib/table/deps`: treats any
- *  `pending` (with or without a jobId) as in-flight. The optimistic-patch
- *  context uses this to avoid re-marking a cell we just flipped optimistically.
- *  The eligibility predicate uses the stricter version. */
-function isOptimisticInFlight(exec: RowExecutionMetadata | undefined): boolean {
-  return exec?.status === 'running' || exec?.status === 'queued' || exec?.status === 'pending'
-}
-
 /**
  * The single canonical run mutation. Every UI gesture (single cell, per-row
  * Play, action-bar Play/Refresh, column-header menu) maps to a `groupIds` +
@@ -1292,32 +1341,47 @@ export function useRunColumn({ workspaceId, tableId }: RowMutationContext) {
         const executions = r.executions ?? {}
         let changed = false
         const next: RowExecutions = { ...executions }
+        const nextData = { ...r.data }
         for (const groupId of targetGroupIds) {
           const exec = executions[groupId] as RowExecutionMetadata | undefined
-          if (isOptimisticInFlight(exec)) continue
+          if (isExecInFlight(exec)) continue
+          const group = groupsById.get(groupId)
+          // Mirror server eligibility: rows with unmet deps are skipped by the
+          // dispatcher regardless of mode. Stamping pending here would leave
+          // the cell flashing Queued indefinitely (no SSE event will arrive).
+          if (group && !areGroupDepsSatisfied(group, r)) continue
           // Mirror server eligibility for `mode: 'incomplete'`: skip cells whose
           // outputs are filled, regardless of exec status. A cancelled/error
           // cell with a leftover value from a prior run was rendering as filled
           // but flipping to "queued" optimistically here even though the server
           // would skip it.
-          if (runMode === 'incomplete') {
-            const group = groupsById.get(groupId)
-            if (group && areOutputsFilled(group, r)) continue
-          }
+          if (runMode === 'incomplete' && group && areOutputsFilled(group, r)) continue
           next[groupId] = buildPendingExec(exec)
+          // Mirror the server-side bulk clear: wipe output values so the cell
+          // doesn't render the stale completed value behind a pending badge.
+          // Without this the cell-render path's "value wins" branch keeps
+          // showing the previous run's output and the Queued/Running pill
+          // never appears.
+          if (group) {
+            for (const o of group.outputs) {
+              if (o.columnName in nextData) nextData[o.columnName] = null
+            }
+          }
           changed = true
         }
         if (!changed) return null
-        return { ...r, executions: next }
+        return { ...r, data: nextData, executions: next }
       })
       return { snapshots }
     },
     onError: (_err, _variables, context) => {
       if (context?.snapshots) restoreCachedWorkflowCells(queryClient, context.snapshots)
     },
-    // No reconciliation here — useTableEventStream is the source of truth for
-    // post-mutation cache state, and a refetch would race its incremental
-    // patches.
+    onSuccess: () => {
+      // Seed the active-dispatch overlay immediately (insertDispatch ran
+      // server-side before responding); rows cache stays owned by SSE.
+      void queryClient.invalidateQueries({ queryKey: tableKeys.activeDispatches(tableId) })
+    },
   })
 }
 
diff --git a/apps/sim/lib/api/contracts/tables.ts b/apps/sim/lib/api/contracts/tables.ts
index db7ecbb57ad..18f23ae67e3 100644
--- a/apps/sim/lib/api/contracts/tables.ts
+++ b/apps/sim/lib/api/contracts/tables.ts
@@ -898,11 +898,13 @@ export const runColumnContract = defineRouteContract({
   response: {
     mode: 'json',
     /**
-     * `triggered` is `null` when the dispatcher runs in the background — the
-     * actual count is only known after a fan-out that may be tens of thousands
-     * of rows, and we don't hold the HTTP response open for that long.
+     * `dispatchId` is the id of the `table_run_dispatches` row created for
+     * this run. The dispatcher task picks it up and crawls the table row by
+     * row; clients receive cell + dispatch events via SSE. Null when
+     * trigger.dev is disabled — in that mode cells run inline in-process and
+     * no dispatch row is created.
      */
-    schema: successResponseSchema(z.object({ triggered: z.number().nullable() })),
+    schema: successResponseSchema(z.object({ dispatchId: z.string().min(1).nullable() })),
   },
 })
 
@@ -915,6 +917,47 @@ export type RunColumnBodyInput = z.input<typeof runColumnBodySchema>
  *  builds a run-column payload. Single source of truth for the literal pair. */
 export type RunMode = NonNullable<RunColumnBodyInput['runMode']>
 
+/**
+ * Active dispatch overlay: rows in the scope ahead of `cursor` render as
+ * `pending` on refresh, so a long Run-all doesn't lose its queued indicators.
+ * Returned by `GET /api/table/[tableId]/dispatches`; mirrored client-side via
+ * `kind: 'dispatch'` SSE events.
+ */
+export const activeDispatchSchema = z.object({
+  id: z.string(),
+  status: z.enum(['pending', 'dispatching']),
+  mode: z.enum(['all', 'incomplete', 'new']),
+  isManualRun: z.boolean(),
+  cursor: z.number().int(),
+  scope: z.object({
+    groupIds: z.array(z.string()),
+    rowIds: z.array(z.string()).optional(),
+  }),
+})
+
+export const listActiveDispatchesContract = defineRouteContract({
+  method: 'GET',
+  path: '/api/table/[tableId]/dispatches',
+  params: tableIdParamsSchema,
+  response: {
+    mode: 'json',
+    schema: successResponseSchema(
+      z.object({
+        dispatches: z.array(activeDispatchSchema),
+        /** Total cells across the table whose `status === 'running'`. The
+         *  client maintains this incrementally via cell SSE events; this
+         *  field is the bootstrap snapshot on mount. */
+        runningCellCount: z.number().int().nonnegative(),
+        /** Map rowId → number of running cells on that row. Drives the
+         *  per-row badge next to the Stop button. */
+        runningByRowId: z.record(z.string(), z.number().int().positive()),
+      })
+    ),
+  },
+})
+
+export type ActiveDispatch = z.output<typeof activeDispatchSchema>
+
 export const tableEventStreamQuerySchema = z.object({
   from: z.preprocess((value) => {
     if (typeof value !== 'string') return 0
diff --git a/apps/sim/lib/copilot/tools/server/table/user-table.ts b/apps/sim/lib/copilot/tools/server/table/user-table.ts
index 1baee52e9d0..3d20c4f7780 100644
--- a/apps/sim/lib/copilot/tools/server/table/user-table.ts
+++ b/apps/sim/lib/copilot/tools/server/table/user-table.ts
@@ -529,6 +529,11 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             // doesn't, so the guard never trips here. Defensive narrowing.
             return { success: false, message: 'Row update was skipped' }
           }
+          // Auto-dispatch for user edits is handled inside `updateRow`
+          // (mode: 'new' for newly-cleared groups + cancel+rerun for in-flight
+          // downstream groups). Firing a second mode: 'incomplete' dispatch
+          // here would race with the internal one AND bulk-clear sibling-group
+          // outputs (mode: 'incomplete' wipes terminal-state cells in scope).
 
           return {
             success: true,
@@ -1418,24 +1423,19 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
           }
           const requestId = generateId().slice(0, 8)
           assertNotAborted()
-          // Dispatch in the background — large fan-outs (thousands of rows)
-          // issue sequential trigger.dev calls and would otherwise hold the
-          // tool span open for minutes, blocking the chat connection.
-          void runWorkflowColumn({
+          const { dispatchId } = await runWorkflowColumn({
             tableId: args.tableId,
             workspaceId,
             groupIds,
             mode: runMode,
             rowIds,
             requestId,
-          }).catch((err) => {
-            logger.error(`[${requestId}] run_column dispatch failed`, err)
           })
           const scopeLabel = rowIds ? `${rowIds.length} row(s) by id` : runMode
           return {
             success: true,
             message: `Started running ${groupIds.length} column(s) (${scopeLabel}). Cells will populate as workflows complete.`,
-            data: { triggered: null },
+            data: { dispatchId },
           }
         }
 
diff --git a/apps/sim/lib/core/async-jobs/backends/database.ts b/apps/sim/lib/core/async-jobs/backends/database.ts
index 0350d57aa6c..1770c464c82 100644
--- a/apps/sim/lib/core/async-jobs/backends/database.ts
+++ b/apps/sim/lib/core/async-jobs/backends/database.ts
@@ -1,7 +1,7 @@
 import { asyncJobs, db } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
-import { generateId } from '@sim/utils/id'
+import { generateShortId } from '@sim/utils/id'
 import { eq, sql } from 'drizzle-orm'
 import {
   type EnqueueOptions,
@@ -37,6 +37,14 @@ function rowToJob(row: AsyncJobRow): Job {
 
 const inlineAbortControllers = new Map<string, AbortController>()
 
+/**
+ * Per-cancel-key abort controllers for the `batchEnqueueAndWait` direct-call
+ * path. Distinct from `inlineAbortControllers` (which keys by jobId) — this
+ * map keys by the domain `cancelKey` callers pass in, since the await-blocking
+ * path skips `async_jobs` entirely and has no jobId to cancel by.
+ */
+const inlineCancelKeyControllers = new Map<string, AbortController>()
+
 interface Semaphore {
   limit: number
   available: number
@@ -77,7 +85,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
     payload: TPayload,
     options?: EnqueueOptions
   ): Promise<string> {
-    const jobId = options?.jobId ?? `run_${generateId().replace(/-/g, '').slice(0, 20)}`
+    const jobId = options?.jobId ?? `run_${generateShortId(20)}`
     const now = new Date()
 
     await db
@@ -116,7 +124,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
     if (items.length === 0) return []
     const now = new Date()
     const rows = items.map(({ payload, options }) => ({
-      id: `run_${generateId().replace(/-/g, '').slice(0, 20)}`,
+      id: `run_${generateShortId(20)}`,
       type,
       payload: payload as Record<string, unknown>,
       status: JOB_STATUS.PENDING,
@@ -148,6 +156,44 @@ export class DatabaseJobQueue implements JobQueueBackend {
     return rows.map((r) => r.id)
   }
 
+  /** Skips `async_jobs` entirely — ids are returned empty since callers can't
+   *  look up rows that don't exist. Cancel goes through `cancelByKey`. */
+  async batchEnqueueAndWait<TPayload>(
+    type: JobType,
+    items: Array<{ payload: TPayload; options?: EnqueueOptions }>
+  ): Promise<string[]> {
+    if (items.length === 0) return []
+    const tracked: Array<{ key: string; controller: AbortController }> = []
+    const runs = items.map((item) => {
+      const runner = item.options?.runner
+      if (!runner) return Promise.resolve()
+      const controller = new AbortController()
+      const cancelKey = item.options?.cancelKey
+      if (cancelKey) {
+        inlineCancelKeyControllers.set(cancelKey, controller)
+        tracked.push({ key: cancelKey, controller })
+      }
+      return runner(item.payload, controller.signal).catch((err) => {
+        logger.error(`[${type}] Inline run failed`, {
+          cancelKey,
+          error: toError(err).message,
+        })
+      })
+    })
+    try {
+      await Promise.all(runs)
+    } finally {
+      // Compare-and-delete guards against a re-enqueue under the same key
+      // racing with our cleanup.
+      for (const t of tracked) {
+        if (inlineCancelKeyControllers.get(t.key) === t.controller) {
+          inlineCancelKeyControllers.delete(t.key)
+        }
+      }
+    }
+    return items.map(() => '')
+  }
+
   async getJob(jobId: string): Promise<Job | null> {
     const [row] = await db.select().from(asyncJobs).where(eq(asyncJobs.id, jobId)).limit(1)
 
@@ -228,6 +274,14 @@ export class DatabaseJobQueue implements JobQueueBackend {
     logger.debug('Marked job as cancelled (DB queue)', { jobId, abortedInline: aborted })
   }
 
+  cancelByKey(cancelKey: string): boolean {
+    const controller = inlineCancelKeyControllers.get(cancelKey)
+    if (!controller) return false
+    controller.abort('Cancelled')
+    inlineCancelKeyControllers.delete(cancelKey)
+    return true
+  }
+
   /**
    * Fire-and-forget IIFE that owns the lifecycle for an inline job: registers
    * the abort controller (so `cancelJob` can interrupt mid-flight), acquires
diff --git a/apps/sim/lib/core/async-jobs/backends/trigger-dev.ts b/apps/sim/lib/core/async-jobs/backends/trigger-dev.ts
index 97a7428b310..ef0fcaed65f 100644
--- a/apps/sim/lib/core/async-jobs/backends/trigger-dev.ts
+++ b/apps/sim/lib/core/async-jobs/backends/trigger-dev.ts
@@ -1,4 +1,5 @@
 import { createLogger } from '@sim/logger'
+import { taskContext } from '@trigger.dev/core/v3'
 import { runs, type TriggerOptions, tasks } from '@trigger.dev/sdk'
 import {
   type EnqueueOptions,
@@ -103,6 +104,50 @@ export class TriggerDevJobQueue implements JobQueueBackend {
     return ids
   }
 
+  async batchEnqueueAndWait<TPayload>(
+    type: JobType,
+    items: Array<{ payload: TPayload; options?: EnqueueOptions }>
+  ): Promise<string[]> {
+    if (items.length === 0) return []
+    // The SDK's checkpoint-and-resume requires task runtime context. The only
+    // caller (`dispatcherStep` invoked by `tableRunDispatcherTask.run`) is
+    // always inside a task; check defensively so misuse fails at the boundary
+    // instead of as a confusing SDK internal error.
+    if (!taskContext.isInsideTask) {
+      throw new Error(
+        'batchEnqueueAndWait requires trigger.dev task runtime context — call from within a registered task'
+      )
+    }
+
+    const taskId = JOB_TYPE_TO_TASK_ID[type]
+    if (!taskId) throw new Error(`Unknown job type: ${type}`)
+
+    const batchItems = items.map(({ payload, options }) => {
+      const enrichedPayload =
+        options?.metadata && typeof payload === 'object' && payload !== null
+          ? { ...payload, ...options.metadata }
+          : payload
+      const tags = buildTags(options)
+      const batchItem: {
+        payload: unknown
+        options?: { concurrencyKey?: string; tags?: string[] }
+      } = { payload: enrichedPayload }
+      const batchOpts: { concurrencyKey?: string; tags?: string[] } = {}
+      if (options?.concurrencyKey) batchOpts.concurrencyKey = options.concurrencyKey
+      if (tags.length > 0) batchOpts.tags = tags
+      if (Object.keys(batchOpts).length > 0) batchItem.options = batchOpts
+      return batchItem
+    })
+
+    const result = await tasks.batchTriggerAndWait(taskId, batchItems)
+    logger.debug('batchTriggerAndWait completed', {
+      type,
+      taskId,
+      runCount: result.runs.length,
+    })
+    return result.runs.map((r) => r.id)
+  }
+
   async getJob(jobId: string): Promise<Job | null> {
     try {
       const run = await runs.retrieve(jobId)
@@ -168,6 +213,13 @@ export class TriggerDevJobQueue implements JobQueueBackend {
       throw error
     }
   }
+
+  cancelByKey(_cancelKey: string): boolean {
+    // No in-process AbortControllers to abort — trigger.dev runs are cancelled
+    // by jobId or via tag sweep (see `cancelCellRunsByTags`). Callers that
+    // need both surfaces should fan out themselves.
+    return false
+  }
 }
 
 /**
diff --git a/apps/sim/lib/core/async-jobs/config.ts b/apps/sim/lib/core/async-jobs/config.ts
index b28f5453ea4..5d32dc6fcd8 100644
--- a/apps/sim/lib/core/async-jobs/config.ts
+++ b/apps/sim/lib/core/async-jobs/config.ts
@@ -1,4 +1,5 @@
 import { createLogger } from '@sim/logger'
+import { taskContext } from '@trigger.dev/core/v3'
 import type { AsyncBackendType, JobQueueBackend } from '@/lib/core/async-jobs/types'
 import { isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
 
@@ -10,10 +11,15 @@ let cachedInlineBackend: JobQueueBackend | null = null
 
 /**
  * Determines which async backend to use based on environment configuration.
- * Follows the fallback chain: trigger.dev → database
+ * Falls back to the database backend when trigger.dev isn't enabled — except
+ * when this process IS a trigger.dev worker (`taskContext.isInsideTask`), in
+ * which case the SDK runtime is available regardless of env vars and we
+ * always want to enqueue back through trigger.dev. Without this carve-out, a
+ * worker pod missing `TRIGGER_DEV_ENABLED=true` silently routes cell jobs to
+ * the database backend that nothing's draining.
  */
 export function getAsyncBackendType(): AsyncBackendType {
-  if (isTriggerDevEnabled) {
+  if (isTriggerDevEnabled || taskContext.isInsideTask) {
     return 'trigger-dev'
   }
 
diff --git a/apps/sim/lib/core/async-jobs/types.ts b/apps/sim/lib/core/async-jobs/types.ts
index e1d2c411313..3acb9927c25 100644
--- a/apps/sim/lib/core/async-jobs/types.ts
+++ b/apps/sim/lib/core/async-jobs/types.ts
@@ -96,6 +96,14 @@ export interface EnqueueOptions {
    * payload and an `AbortSignal` driven by `cancelJob`.
    */
   runner?: <TPayload>(payload: TPayload, signal: AbortSignal) => Promise<void>
+  /**
+   * Stable identity for cancellation lookups on the database backend's
+   * `batchEnqueueAndWait` path (which skips `async_jobs` entirely, so there
+   * is no jobId to cancel by). Lets callers map a domain identity (e.g.
+   * `tableId:rowId:groupId`) to the in-flight `AbortController`. Ignored
+   * by trigger.dev — runs there are cancelled by tag or jobId.
+   */
+  cancelKey?: string
 }
 
 /**
@@ -118,6 +126,28 @@ export interface JobQueueBackend {
     items: Array<{ payload: TPayload; options?: EnqueueOptions }>
   ): Promise<string[]>
 
+  /**
+   * Enqueue a batch and block until every job has reached a terminal state
+   * (completed, failed, or cancelled). The caller — typically a dispatcher
+   * walking work in windows — uses this to gate window N+1 on window N's
+   * completion.
+   *
+   * Backend implementations:
+   * - Trigger.dev: wraps `tasks.batchTriggerAndWait`. MUST be called from
+   *   inside a registered trigger.dev task (the SDK's checkpoint-and-resume
+   *   requires task runtime context). Backends guard with
+   *   `taskContext.isInsideTask` and throw a clear error otherwise.
+   * - Database (in-process): bypasses `async_jobs` entirely. Since the
+   *   caller is awaiting in-process, the row would serve no live purpose
+   *   (no cross-process recovery, no by-id lookup, no semaphore needed —
+   *   window size IS the concurrency cap). Calls the runner directly via
+   *   `Promise.all` and resolves on the runner's exit.
+   */
+  batchEnqueueAndWait<TPayload>(
+    type: JobType,
+    items: Array<{ payload: TPayload; options?: EnqueueOptions }>
+  ): Promise<string[]>
+
   /**
    * Get a job by ID
    */
@@ -144,6 +174,15 @@ export interface JobQueueBackend {
    * should resolve quietly so callers can drive cancel from possibly-stale state.
    */
   cancelJob(jobId: string): Promise<void>
+
+  /**
+   * Cancel an in-flight job by its `cancelKey` (the domain identity callers
+   * stamped on enqueue via `EnqueueOptions.cancelKey`). Used by
+   * `batchEnqueueAndWait` paths that skip per-job ids; the trigger.dev
+   * backend has no in-process AbortControllers to abort and returns `false`.
+   * Returns `true` if a matching controller was found and aborted.
+   */
+  cancelByKey(cancelKey: string): boolean
 }
 
 export type AsyncBackendType = 'trigger-dev' | 'database'
diff --git a/apps/sim/lib/table/cascade-lock.ts b/apps/sim/lib/table/cascade-lock.ts
new file mode 100644
index 00000000000..cfdb4702c5f
--- /dev/null
+++ b/apps/sim/lib/table/cascade-lock.ts
@@ -0,0 +1,61 @@
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { acquireLock, extendLock, releaseLock } from '@/lib/core/config/redis'
+
+const logger = createLogger('TableCascadeLock')
+
+/** Lock TTL. Crashed pods release within this many seconds. */
+const LOCK_TTL_SECONDS = 30
+/** Heartbeat cadence. ~3x within TTL — tolerates two missed beats. */
+const HEARTBEAT_INTERVAL_MS = 10_000
+
+/** Single source of truth for the cascade-lock key shape. The lock arbitrates
+ *  ownership of a row's full workflow-group cascade — only the owner advances
+ *  the row through its eligible groups. */
+export function cascadeLockKey(tableId: string, rowId: string): string {
+  return `table:cascade:${tableId}:${rowId}`
+}
+
+/**
+ * Run `fn` while holding the row's cascade lock, with a heartbeat extending
+ * the TTL every 10s so a crashed pod releases the lock in ≤30s. `ownerId`
+ * must be unique per holder (typically the cell-task's `executionId`) so
+ * `releaseLock` does compare-and-delete and can't accidentally drop another
+ * owner's lock.
+ *
+ * Returns `'acquired'` after `fn` resolves, or `'contended'` if another
+ * task already holds the lock — `fn` is NOT invoked in that case. The
+ * caller decides what to do on contention (cell-task bails; resume worker
+ * still writes the resumed-group's terminal state but skips the cascade).
+ *
+ * NOTE: when Redis is unavailable, `acquireLock` returns `true` as a
+ * single-replica fallback — concurrent cell-tasks would all "acquire" and
+ * run in parallel. The cell-write SQL guard mitigates double-writes but
+ * doesn't prevent duplicate workflow executions.
+ */
+export async function withCascadeLock<T>(
+  tableId: string,
+  rowId: string,
+  ownerId: string,
+  fn: () => Promise<T>
+): Promise<{ status: 'acquired'; result: T } | { status: 'contended' }> {
+  const key = cascadeLockKey(tableId, rowId)
+  const acquired = await acquireLock(key, ownerId, LOCK_TTL_SECONDS)
+  if (!acquired) return { status: 'contended' }
+
+  const heartbeat = setInterval(() => {
+    extendLock(key, ownerId, LOCK_TTL_SECONDS).catch((err) => {
+      logger.warn(`Heartbeat refresh failed for ${key}`, { error: toError(err).message })
+    })
+  }, HEARTBEAT_INTERVAL_MS)
+
+  try {
+    const result = await fn()
+    return { status: 'acquired', result }
+  } finally {
+    clearInterval(heartbeat)
+    await releaseLock(key, ownerId).catch((err) => {
+      logger.warn(`Lock release failed for ${key}`, { error: toError(err).message })
+    })
+  }
+}
diff --git a/apps/sim/lib/table/cell-write.ts b/apps/sim/lib/table/cell-write.ts
index 5e179319f9e..c2655a1e745 100644
--- a/apps/sim/lib/table/cell-write.ts
+++ b/apps/sim/lib/table/cell-write.ts
@@ -161,7 +161,9 @@ export async function markWorkflowGroupPickedUp(
 /** Builds the canonical `cancelled` execution state used by every cancel path.
  *  Preserves `blockErrors` from the prior state so errored cells keep
  *  rendering Error after a stop click — only cells that hadn't yet produced
- *  a value or an error should flip to "Cancelled". */
+ *  a value or an error should flip to "Cancelled". `cancelledAt` is the
+ *  tombstone the dispatcher reads to skip re-runs of cells the user killed
+ *  mid-cascade. */
 export function buildCancelledExecution(
   prev: Pick<RowExecutionMetadata, 'executionId' | 'workflowId' | 'blockErrors'>
 ): RowExecutionMetadata {
@@ -171,6 +173,7 @@ export function buildCancelledExecution(
     jobId: null,
     workflowId: prev.workflowId,
     error: 'Cancelled',
+    cancelledAt: new Date().toISOString(),
     ...(prev.blockErrors ? { blockErrors: prev.blockErrors } : {}),
   }
 }
diff --git a/apps/sim/lib/table/deps.ts b/apps/sim/lib/table/deps.ts
index d9b33f59dbb..9cc19293a3f 100644
--- a/apps/sim/lib/table/deps.ts
+++ b/apps/sim/lib/table/deps.ts
@@ -10,18 +10,18 @@ import type { RowData, RowExecutionMetadata, RowExecutions, TableRow, WorkflowGr
 const logger = createLogger('OptimisticCascade')
 
 /**
- * True when the cell has a worker actively reserved — `queued` / `running`,
- * or `pending` after the scheduler stamped a jobId. Single source of truth
- * for the "is this exec in flight" classification across the eligibility
- * predicate, optimistic patches, status counters, and renderer. `pending`
- * without a jobId is the optimistic-flag-only state, not in-flight.
+ * True when the cell is `pending` / `queued` / `running`. Single source of
+ * truth for the "is this exec in flight" classification across the
+ * eligibility predicate, optimistic patches, status counters, and renderer.
+ * `pending` counts even without a jobId so the row-gutter Stop button is
+ * available the moment the user clicks Play — the cancel path writes
+ * `cancelled` authoritatively whether or not a real trigger.dev run exists
+ * yet, which is correct: cancel means "don't run this."
  */
 export function isExecInFlight(exec: RowExecutionMetadata | undefined): boolean {
   if (!exec) return false
   const s = exec.status
-  if (s === 'queued' || s === 'running') return true
-  if (s === 'pending' && exec.jobId) return true
-  return false
+  return s === 'queued' || s === 'running' || s === 'pending'
 }
 
 /**
@@ -75,10 +75,10 @@ export function getUnmetGroupDeps(group: WorkflowGroup, row: TableRow): UnmetDep
 /**
  * Optimistic mirror of the server's row-update→scheduler cascade: for every
  * workflow group whose deps were unmet *before* the patch and are satisfied
- * *after*, return a new `executions` map with that group flipped to
- * `pending`. The cell renderer treats `pending` as "Queued", which is what
- * the user expects to see immediately after they fill in the missing input —
- * not a flash of dash before the server's pending write arrives.
+ * *after*, OR whose dep column was touched by the patch (the server will
+ * cancel+re-run via `deriveExecClearsForDataPatch` + the in-flight cancel
+ * orchestration), return a new `executions` map with that group flipped to
+ * `pending`. The cell renderer treats `pending` as "Queued".
  *
  * Returns `null` when nothing changed, so callers can short-circuit.
  */
@@ -93,6 +93,7 @@ export function optimisticallyScheduleNewlyEligibleGroups(
     ...beforeRow,
     data: { ...beforeRow.data, ...patch } as RowData,
   }
+  const patchedColumns = new Set(Object.keys(patch))
 
   let next: RowExecutions | null = null
   let flipped = 0
@@ -108,10 +109,6 @@ export function optimisticallyScheduleNewlyEligibleGroups(
     }
 
     const exec = beforeRow.executions?.[group.id]
-    if (exec?.status === 'queued' || exec?.status === 'running') {
-      skipped++
-      continue
-    }
     if (exec?.status === 'pending' && exec.jobId) {
       skipped++
       continue
@@ -121,7 +118,17 @@ export function optimisticallyScheduleNewlyEligibleGroups(
     const wasSatisfied = areGroupDepsSatisfied(group, beforeRow)
     const becameSatisfied = !wasSatisfied
     const isRetryable = exec?.status === 'cancelled' || exec?.status === 'error'
-    if (!becameSatisfied && !isStaleCompleted && !isRetryable && exec) {
+    // Dep-column touched: the server clears terminal entries + cancels in-
+    // flight downstream groups, so optimistically flip to `pending`
+    // regardless of current exec status (queued/running included — they're
+    // about to be cancelled and re-run).
+    const depTouched = (group.dependencies?.columns ?? []).some((d) => patchedColumns.has(d))
+
+    if (!depTouched && (exec?.status === 'queued' || exec?.status === 'running')) {
+      skipped++
+      continue
+    }
+    if (!becameSatisfied && !isStaleCompleted && !isRetryable && !depTouched && exec) {
       skipped++
       continue
     }
diff --git a/apps/sim/lib/table/dispatcher.ts b/apps/sim/lib/table/dispatcher.ts
new file mode 100644
index 00000000000..ab91ff67cb4
--- /dev/null
+++ b/apps/sim/lib/table/dispatcher.ts
@@ -0,0 +1,543 @@
+import { db } from '@sim/db'
+import { tableRowExecutions, tableRunDispatches, userTableRows } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
+import { and, asc, eq, gt, inArray, type SQL, sql } from 'drizzle-orm'
+import { getJobQueue } from '@/lib/core/async-jobs/config'
+import { writeWorkflowGroupState } from '@/lib/table/cell-write'
+import { appendTableEvent } from '@/lib/table/events'
+import type { RowExecutionMetadata, RowExecutions, TableRow } from '@/lib/table/types'
+import {
+  buildEnqueueItems,
+  buildPendingRuns,
+  TABLE_CONCURRENCY_LIMIT,
+  toTableRow,
+  type WorkflowGroupCellPayload,
+} from './workflow-columns'
+
+const logger = createLogger('TableRunDispatcher')
+
+/** Window size matches the cell-execution concurrency cap so one window
+ *  saturates the pool before the next is loaded — yields a row-major
+ *  scan-line crawl (rows 1-20 finish before 21-40 start). */
+const WINDOW_SIZE = TABLE_CONCURRENCY_LIMIT
+
+const ACTIVE_DISPATCH_STATUSES = ['pending', 'dispatching'] as const
+
+export type DispatchStatus = 'pending' | 'dispatching' | 'complete' | 'cancelled'
+export type DispatchMode = 'all' | 'incomplete' | 'new'
+
+export interface DispatchScope {
+  groupIds: string[]
+  rowIds?: string[]
+}
+
+export interface DispatchRow {
+  id: string
+  tableId: string
+  workspaceId: string
+  requestId: string
+  mode: DispatchMode
+  scope: DispatchScope
+  status: DispatchStatus
+  cursor: number
+  isManualRun: boolean
+  requestedAt: Date
+}
+
+export type DispatcherStepResult = 'continue' | 'done'
+
+/** Eager bulk clear at click time so the user sees every targeted cell go
+ *  blank/Pending instantly — without it, only the rows the dispatcher has
+ *  reached visibly change, and the rest sit on stale data until the cursor
+ *  walks to them. For `mode: 'incomplete'` we skip rows whose outputs are
+ *  already filled, mirroring the eligibility predicate. */
+export async function bulkClearWorkflowGroupCells(input: {
+  tableId: string
+  groups: Array<{ id: string; outputs: Array<{ columnName: string }> }>
+  rowIds?: string[]
+  mode: DispatchMode
+}): Promise<void> {
+  const { tableId, groups, rowIds, mode } = input
+  if (groups.length === 0) return
+  // `'new'` mode targets only rows with no prior attempt — nothing to clear.
+  // Pre-existing outputs on any other row must not be wiped by an auto-fire.
+  if (mode === 'new') return
+
+  const outputCols = Array.from(new Set(groups.flatMap((g) => g.outputs.map((o) => o.columnName))))
+  const groupIds = groups.map((g) => g.id)
+
+  // Step 1: clear the targeted output columns from `data` on every row in
+  // scope. Identical chain to the previous JSONB-only path.
+  let dataExpr: SQL = sql`coalesce(${userTableRows.data}, '{}'::jsonb)`
+  for (const col of outputCols) dataExpr = sql`(${dataExpr}) - ${col}::text`
+
+  const filters: SQL[] = [eq(userTableRows.tableId, tableId)]
+  if (rowIds && rowIds.length > 0) {
+    filters.push(inArray(userTableRows.id, rowIds))
+  }
+  if (mode === 'incomplete') {
+    // Skip rows where all output columns across all targeted groups already
+    // have a non-empty value — those are "completed-and-filled" and the
+    // eligibility predicate would skip them anyway.
+    const filledChecks = outputCols.map(
+      (col) => sql`coalesce(${userTableRows.data} ->> ${col}, '') != ''`
+    )
+    const allFilled = filledChecks.reduce((acc, expr) => sql`${acc} AND ${expr}`)
+    filters.push(sql`NOT (${allFilled})`)
+    // Also skip rows where ANY targeted group has an in-flight exec — those
+    // belong to another dispatch and clobbering them would race. Encoded as
+    // a NOT EXISTS subquery against the sidecar's `(table_id, status)`
+    // partial index.
+    filters.push(
+      sql`NOT EXISTS (
+        SELECT 1 FROM ${tableRowExecutions} re
+        WHERE re.row_id = ${userTableRows.id}
+          AND re.group_id = ANY(ARRAY[${sql.join(
+            groupIds.map((gid) => sql`${gid}`),
+            sql`, `
+          )}]::text[])
+          AND re.status IN ('queued', 'running', 'pending')
+      )`
+    )
+  }
+
+  await db.transaction(async (trx) => {
+    await trx
+      .update(userTableRows)
+      .set({ data: dataExpr, updatedAt: new Date() })
+      .where(and(...filters))
+
+    // Step 2: delete the targeted groups' executions for the rows in scope.
+    // Reuse the same row-scope filter via a subquery.
+    const execFilters: SQL[] = [
+      eq(tableRowExecutions.tableId, tableId),
+      inArray(tableRowExecutions.groupId, groupIds),
+    ]
+    if (rowIds && rowIds.length > 0) {
+      execFilters.push(inArray(tableRowExecutions.rowId, rowIds))
+    }
+    if (mode === 'incomplete') {
+      // For `incomplete`, only delete entries that aren't already in-flight
+      // — terminal states (completed/error/cancelled) get wiped so the
+      // dispatcher re-enqueues; in-flight entries stay so we don't race
+      // with their worker.
+      execFilters.push(sql`${tableRowExecutions.status} NOT IN ('queued', 'running', 'pending')`)
+    }
+    await trx.delete(tableRowExecutions).where(and(...execFilters))
+  })
+}
+
+export async function insertDispatch(input: {
+  tableId: string
+  workspaceId: string
+  requestId: string
+  mode: DispatchMode
+  scope: DispatchScope
+  isManualRun: boolean
+}): Promise<string> {
+  const id = `tdsp_${generateId().replace(/-/g, '')}`
+  await db.insert(tableRunDispatches).values({
+    id,
+    tableId: input.tableId,
+    workspaceId: input.workspaceId,
+    requestId: input.requestId,
+    mode: input.mode,
+    scope: input.scope,
+    status: 'pending',
+    // -1 = "haven't started." First window's filter `position > -1` matches
+    // position 0; subsequent iterations advance to `lastPosition` which then
+    // correctly excludes already-processed rows.
+    cursor: -1,
+    isManualRun: input.isManualRun,
+  })
+  return id
+}
+
+/** Read every dispatch on a table whose status is still `pending` or
+ *  `dispatching`. Drives the client-side "about to run" overlay: rows in an
+ *  active dispatch's scope ahead of its cursor are rendered as queued even
+ *  before the dispatcher has reached them, so refresh during a long Run-all
+ *  doesn't lose the queued indicators. */
+/** Counts in-flight cells (queued / running / pending) across the entire
+ *  table — the authoritative source for the "X running" badge and the per-row
+ *  gutter Run/Stop button. All three statuses are user-cancellable, so the
+ *  gutter must surface Stop whenever any of them are present (else clicking
+ *  Play during the queued window would re-run an already-queued cell).
+ *  Hits the `(table_id, status)` partial index on table_row_executions. */
+export async function countRunningCells(
+  tableId: string
+): Promise<{ total: number; byRowId: Record<string, number> }> {
+  const rows = await db
+    .select({
+      rowId: tableRowExecutions.rowId,
+      runningCount: sql<number>`count(*)::int`,
+    })
+    .from(tableRowExecutions)
+    .where(
+      and(
+        eq(tableRowExecutions.tableId, tableId),
+        inArray(tableRowExecutions.status, ['queued', 'running', 'pending'])
+      )
+    )
+    .groupBy(tableRowExecutions.rowId)
+  let total = 0
+  const byRowId: Record<string, number> = {}
+  for (const r of rows) {
+    if (r.runningCount > 0) {
+      byRowId[r.rowId] = r.runningCount
+      total += r.runningCount
+    }
+  }
+  return { total, byRowId }
+}
+
+export async function listActiveDispatches(tableId: string): Promise<DispatchRow[]> {
+  const rows = await db
+    .select()
+    .from(tableRunDispatches)
+    .where(
+      and(
+        eq(tableRunDispatches.tableId, tableId),
+        inArray(tableRunDispatches.status, [...ACTIVE_DISPATCH_STATUSES])
+      )
+    )
+  return rows.map((row) => ({
+    id: row.id,
+    tableId: row.tableId,
+    workspaceId: row.workspaceId,
+    requestId: row.requestId,
+    mode: row.mode as DispatchMode,
+    scope: row.scope as DispatchScope,
+    status: row.status as DispatchStatus,
+    cursor: row.cursor,
+    isManualRun: row.isManualRun,
+    requestedAt: row.requestedAt,
+  }))
+}
+
+export async function readDispatch(dispatchId: string): Promise<DispatchRow | null> {
+  const [row] = await db
+    .select()
+    .from(tableRunDispatches)
+    .where(eq(tableRunDispatches.id, dispatchId))
+    .limit(1)
+  if (!row) return null
+  return {
+    id: row.id,
+    tableId: row.tableId,
+    workspaceId: row.workspaceId,
+    requestId: row.requestId,
+    mode: row.mode as DispatchMode,
+    scope: row.scope as DispatchScope,
+    status: row.status as DispatchStatus,
+    cursor: row.cursor,
+    isManualRun: row.isManualRun,
+    requestedAt: row.requestedAt,
+  }
+}
+
+/** Drive `dispatcherStep` to completion. Shared between the trigger.dev task
+ *  wrapper (`tableRunDispatcherTask`) and the in-process inline path so both
+ *  runtimes use identical loop semantics + error logging. */
+export async function runDispatcherToCompletion(dispatchId: string): Promise<void> {
+  while ((await dispatcherStep(dispatchId)) === 'continue') {}
+}
+
+/** Run one window of the dispatcher state machine. Caller re-invokes (via the
+ *  trigger.dev task wrapper) until the returned status is `'done'`. */
+export async function dispatcherStep(dispatchId: string): Promise<DispatcherStepResult> {
+  const dispatch = await readDispatch(dispatchId)
+  if (!dispatch) {
+    logger.warn(`[${dispatchId}] dispatch row missing — aborting`)
+    return 'done'
+  }
+  if (dispatch.status === 'cancelled' || dispatch.status === 'complete') return 'done'
+
+  const { getTableById } = await import('./service')
+  const table = await getTableById(dispatch.tableId)
+  if (!table) {
+    logger.warn(`[${dispatchId}] table ${dispatch.tableId} missing — completing dispatch`)
+    await markDispatchComplete(dispatchId)
+    return 'done'
+  }
+
+  const allGroups = table.schema.workflowGroups ?? []
+  const targetGroups = allGroups.filter((g) => dispatch.scope.groupIds.includes(g.id))
+  if (targetGroups.length === 0) {
+    await markDispatchComplete(dispatchId)
+    return 'done'
+  }
+
+  // First iteration: just transition pending → dispatching. The bulk clear
+  // ran synchronously in `runWorkflowColumn` before this task fired, so the
+  // user already saw the column flip to empty/Pending before any cell
+  // started enqueueing.
+  if (dispatch.status === 'pending') {
+    await db
+      .update(tableRunDispatches)
+      .set({ status: 'dispatching' })
+      .where(eq(tableRunDispatches.id, dispatchId))
+  }
+
+  const filters = [
+    eq(userTableRows.tableId, dispatch.tableId),
+    gt(userTableRows.position, dispatch.cursor),
+  ]
+  if (dispatch.scope.rowIds && dispatch.scope.rowIds.length > 0) {
+    filters.push(inArray(userTableRows.id, dispatch.scope.rowIds))
+  }
+  // `'new'` mode targets only rows whose targeted groups haven't been
+  // attempted. Exclude a row only when EVERY targeted group already has a
+  // sidecar entry — if any one is missing, the row still has work to do
+  // and per-group JS filtering in `classifyEligibility` handles the rest.
+  if (dispatch.mode === 'new' && dispatch.scope.groupIds.length > 0) {
+    const gids = dispatch.scope.groupIds
+    filters.push(
+      sql`NOT EXISTS (
+        SELECT 1 FROM ${tableRowExecutions} re
+        WHERE re.row_id = ${userTableRows.id}
+          AND re.group_id = ANY(ARRAY[${sql.join(
+            gids.map((gid) => sql`${gid}`),
+            sql`, `
+          )}]::text[])
+        GROUP BY re.row_id
+        HAVING count(DISTINCT re.group_id) = ${gids.length}
+      )`
+    )
+  }
+
+  const chunk = await db
+    .select()
+    .from(userTableRows)
+    .where(and(...filters))
+    .orderBy(asc(userTableRows.position))
+    .limit(WINDOW_SIZE)
+
+  if (chunk.length === 0) {
+    await markDispatchComplete(dispatchId)
+    await appendTableEvent({
+      kind: 'dispatch',
+      tableId: dispatch.tableId,
+      dispatchId,
+      status: 'complete',
+      scope: dispatch.scope,
+      cursor: dispatch.cursor,
+      mode: dispatch.mode,
+      isManualRun: dispatch.isManualRun,
+    })
+    return 'done'
+  }
+
+  // Pre-fetch executions for the chunk so per-row eligibility doesn't fan
+  // out into one query per row. Returns `Map<rowId, RowExecutions>`.
+  const chunkRowIds = chunk.map((r) => r.id)
+  const execRows = await db
+    .select()
+    .from(tableRowExecutions)
+    .where(inArray(tableRowExecutions.rowId, chunkRowIds))
+  const executionsByRow = new Map<string, RowExecutions>()
+  for (const r of execRows) {
+    const existing = executionsByRow.get(r.rowId) ?? {}
+    const meta: RowExecutionMetadata = {
+      status: r.status as RowExecutionMetadata['status'],
+      executionId: r.executionId ?? null,
+      jobId: r.jobId ?? null,
+      workflowId: r.workflowId,
+      error: r.error ?? null,
+      ...(r.runningBlockIds && r.runningBlockIds.length > 0
+        ? { runningBlockIds: r.runningBlockIds }
+        : {}),
+      ...(r.blockErrors && Object.keys(r.blockErrors as Record<string, string>).length > 0
+        ? { blockErrors: r.blockErrors as Record<string, string> }
+        : {}),
+      ...(r.cancelledAt ? { cancelledAt: r.cancelledAt.toISOString() } : {}),
+    }
+    existing[r.groupId] = meta
+    executionsByRow.set(r.rowId, existing)
+  }
+
+  // Strip rows the user cancelled mid-cascade (post-dispatch tombstones)
+  // before running the shared eligibility filter — `buildPendingRuns`
+  // doesn't know about the per-dispatch cancel tombstone.
+  const tombstoneFiltered: TableRow[] = []
+  for (const r of chunk) {
+    const tableRow = toTableRow(r, executionsByRow.get(r.id) ?? {})
+    const tombstoned = dispatch.scope.groupIds.some((gid) => {
+      const exec = tableRow.executions?.[gid]
+      if (!exec?.cancelledAt) return false
+      const cancelledAtMs = Date.parse(exec.cancelledAt)
+      return Number.isFinite(cancelledAtMs) && cancelledAtMs > dispatch.requestedAt.getTime()
+    })
+    if (!tombstoned) tombstoneFiltered.push(tableRow)
+  }
+
+  const pendingRuns = buildPendingRuns(table, tombstoneFiltered, {
+    isManualRun: dispatch.isManualRun,
+    groupIds: dispatch.scope.groupIds,
+    mode: dispatch.mode,
+  })
+
+  // Cursor advances to the last position in this chunk regardless of
+  // eligibility — otherwise a window full of skipped cells loops forever.
+  const lastPosition = chunk[chunk.length - 1].position
+
+  if (pendingRuns.length > 0) {
+    await stampQueuedForBatch(pendingRuns)
+
+    // Backend-agnostic batch dispatch: trigger.dev wraps `batchTriggerAndWait`
+    // (CRIU-checkpointed wait); database backend calls the cell-task runner
+    // directly via Promise.all (skips async_jobs since we're awaiting in-
+    // process anyway). Either way the parent dispatcher blocks until every
+    // cell in the window terminates — bounds queue depth at WINDOW_SIZE.
+    const items = await buildEnqueueItems(pendingRuns)
+    const queue = await getJobQueue()
+    try {
+      await queue.batchEnqueueAndWait('workflow-group-cell', items)
+    } catch (err) {
+      logger.error(`[${dispatchId}] batch dispatch failed`, {
+        error: toError(err).message,
+      })
+      // Cursor advances past this window, so flip the un-claimed pre-stamps to
+      // terminal `error` (+ SSE) — visible, not stuck pending, re-runnable.
+      const failedAt = new Date()
+      await Promise.allSettled(
+        pendingRuns.map(async (p) => {
+          const updated = await db
+            .update(tableRowExecutions)
+            .set({ status: 'error', error: 'Failed to enqueue run', updatedAt: failedAt })
+            .where(
+              and(
+                eq(tableRowExecutions.rowId, p.rowId),
+                eq(tableRowExecutions.groupId, p.groupId),
+                eq(tableRowExecutions.status, 'pending'),
+                sql`${tableRowExecutions.executionId} IS NULL`
+              )
+            )
+            .returning({ rowId: tableRowExecutions.rowId })
+          if (updated.length === 0) return
+          await appendTableEvent({
+            kind: 'cell',
+            tableId: dispatch.tableId,
+            rowId: p.rowId,
+            groupId: p.groupId,
+            status: 'error',
+            executionId: null,
+            jobId: null,
+            error: 'Failed to enqueue run',
+          })
+        })
+      )
+    }
+  }
+
+  await Promise.all([
+    advanceCursor(dispatchId, lastPosition),
+    appendTableEvent({
+      kind: 'dispatch',
+      tableId: dispatch.tableId,
+      dispatchId,
+      status: 'dispatching',
+      scope: dispatch.scope,
+      cursor: lastPosition,
+      mode: dispatch.mode,
+      isManualRun: dispatch.isManualRun,
+    }),
+  ])
+
+  return 'continue'
+}
+
+/** Pre-batch stamp: write each targeted cell as `pending` (no executionId)
+ *  before firing the batch so the renderer shows the cell as in-flight
+ *  immediately. The cell-task overwrites with `running` (and its own
+ *  executionId) once it acquires the row's cascade lock — if another
+ *  cell-task already holds the lock, this task bails and the pending stamp
+ *  is later reconciled by whoever owns the cascade. */
+async function stampQueuedForBatch(pendingRuns: WorkflowGroupCellPayload[]): Promise<void> {
+  await Promise.allSettled(
+    pendingRuns.map((runOpts) =>
+      writeWorkflowGroupState(runOpts, {
+        executionState: {
+          status: 'pending',
+          executionId: null,
+          jobId: null,
+          workflowId: runOpts.workflowId,
+          error: null,
+        },
+      })
+    )
+  )
+}
+
+async function advanceCursor(dispatchId: string, newCursor: number): Promise<void> {
+  await db
+    .update(tableRunDispatches)
+    .set({ cursor: newCursor })
+    .where(eq(tableRunDispatches.id, dispatchId))
+}
+
+async function markDispatchComplete(dispatchId: string): Promise<void> {
+  await db
+    .update(tableRunDispatches)
+    .set({ status: 'complete', completedAt: new Date() })
+    .where(eq(tableRunDispatches.id, dispatchId))
+}
+
+export async function markDispatchCancelled(dispatchId: string): Promise<void> {
+  await db
+    .update(tableRunDispatches)
+    .set({ status: 'cancelled', cancelledAt: new Date() })
+    .where(
+      and(
+        eq(tableRunDispatches.id, dispatchId),
+        inArray(tableRunDispatches.status, [...ACTIVE_DISPATCH_STATUSES])
+      )
+    )
+}
+
+/** Mark every active dispatch on this table as cancelled. Single atomic
+ *  UPDATE so the dispatcher's next iteration observes the cancel. Returns the
+ *  dispatches that were cancelled so the caller can emit per-dispatch SSE
+ *  events — without those the client's overlay would hang on "queued" until
+ *  the next refresh. */
+export async function markActiveDispatchesCancelled(tableId: string): Promise<DispatchRow[]> {
+  const cancelled = await db
+    .update(tableRunDispatches)
+    .set({ status: 'cancelled', cancelledAt: new Date() })
+    .where(
+      and(
+        eq(tableRunDispatches.tableId, tableId),
+        inArray(tableRunDispatches.status, [...ACTIVE_DISPATCH_STATUSES])
+      )
+    )
+    .returning()
+  const dispatches = cancelled.map((row) => ({
+    id: row.id,
+    tableId: row.tableId,
+    workspaceId: row.workspaceId,
+    requestId: row.requestId,
+    mode: row.mode as DispatchMode,
+    scope: row.scope as DispatchScope,
+    status: 'cancelled' as DispatchStatus,
+    cursor: row.cursor,
+    isManualRun: row.isManualRun,
+    requestedAt: row.requestedAt,
+  }))
+  await Promise.all(
+    dispatches.map((d) =>
+      appendTableEvent({
+        kind: 'dispatch',
+        tableId: d.tableId,
+        dispatchId: d.id,
+        status: 'cancelled',
+        scope: d.scope,
+        cursor: d.cursor,
+        mode: d.mode,
+        isManualRun: d.isManualRun,
+      })
+    )
+  )
+  return dispatches
+}
diff --git a/apps/sim/lib/table/events.ts b/apps/sim/lib/table/events.ts
index 64d4fabc562..63c2dac92c7 100644
--- a/apps/sim/lib/table/events.ts
+++ b/apps/sim/lib/table/events.ts
@@ -68,30 +68,48 @@ function getMetaKey(tableId: string) {
 
 export type TableCellStatus = 'pending' | 'queued' | 'running' | 'completed' | 'cancelled' | 'error'
 
-export interface TableEvent {
-  kind: 'cell'
-  tableId: string
-  rowId: string
-  groupId: string
-  status: TableCellStatus
-  executionId: string | null
-  jobId: string | null
-  error: string | null
-  /**
-   * Present when this transition wrote new output values; absent on
-   * pure-status transitions (queued, running, cancelled). The publisher
-   * already has these in hand from the same updateRow call that wrote DB.
-   */
-  outputs?: Record<string, unknown>
-  /**
-   * Block-level metadata the renderer reads to distinguish "running" (some
-   * block actively executing) from "pending-upstream" (run started but this
-   * column's block hasn't fired yet). The worker fills these on partial
-   * writes; without them the cell stays on the amber Pending pill.
-   */
-  runningBlockIds?: string[]
-  blockErrors?: Record<string, string>
-}
+export type TableDispatchStatus = 'pending' | 'dispatching' | 'complete' | 'cancelled'
+
+export type TableEvent =
+  | {
+      kind: 'cell'
+      tableId: string
+      rowId: string
+      groupId: string
+      status: TableCellStatus
+      executionId: string | null
+      jobId: string | null
+      error: string | null
+      /**
+       * Present when this transition wrote new output values; absent on
+       * pure-status transitions (queued, running, cancelled). The publisher
+       * already has these in hand from the same updateRow call that wrote DB.
+       */
+      outputs?: Record<string, unknown>
+      /**
+       * Block-level metadata the renderer reads to distinguish "running" (some
+       * block actively executing) from "pending-upstream" (run started but this
+       * column's block hasn't fired yet). The worker fills these on partial
+       * writes; without them the cell stays on the amber Pending pill.
+       */
+      runningBlockIds?: string[]
+      blockErrors?: Record<string, string>
+    }
+  | {
+      /** Dispatcher status signal emitted by `dispatcherStep` and the cancel
+       *  path. Drives the client-side "about to run" overlay for rows the
+       *  dispatcher hasn't reached yet. `scope` + `cursor` + `mode` +
+       *  `isManualRun` are carried on every transition so the client can
+       *  upsert without refetching the dispatches list. */
+      kind: 'dispatch'
+      tableId: string
+      dispatchId: string
+      status: TableDispatchStatus
+      scope?: { groupIds: string[]; rowIds?: string[] }
+      cursor?: number
+      mode?: 'all' | 'incomplete' | 'new'
+      isManualRun?: boolean
+    }
 
 export interface TableEventEntry {
   eventId: number
diff --git a/apps/sim/lib/table/service.ts b/apps/sim/lib/table/service.ts
index 693063bfdd4..7b09325195c 100644
--- a/apps/sim/lib/table/service.ts
+++ b/apps/sim/lib/table/service.ts
@@ -8,7 +8,12 @@
  */
 
 import { db } from '@sim/db'
-import { userTableDefinitions, userTableRows, workflowExecutionLogs } from '@sim/db/schema'
+import {
+  tableRowExecutions,
+  userTableDefinitions,
+  userTableRows,
+  workflowExecutionLogs,
+} from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { getPostgresErrorCode } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
@@ -64,8 +69,8 @@ import {
 } from './validation'
 import {
   assertValidSchema,
-  scheduleRunsForRows,
-  scheduleRunsForTable,
+  cancelWorkflowGroupRuns,
+  runWorkflowColumn,
   stripGroupDeps,
 } from './workflow-columns'
 
@@ -160,6 +165,36 @@ function scaledStatementTimeoutMs(
  * @param tableId - Table ID to fetch
  * @returns Table definition or null if not found
  */
+/**
+ * Returns `schema` with `columns` sorted by `metadata.columnOrder` (the user-
+ * editable visible order). Columns missing from `columnOrder` are appended at
+ * the end in their original (schema-creation) order — covers tables created
+ * before `columnOrder` existed and any drift from out-of-band column adds.
+ *
+ * This makes `schema.columns` the single source of truth for column order on
+ * the wire. The client doesn't have to join the two arrays itself — every
+ * consumer (grid, sidebar, copilot, mothership) gets the same ordered list.
+ */
+function applyColumnOrderToSchema(
+  schema: TableSchema,
+  metadata: TableMetadata | null
+): TableSchema {
+  const order = metadata?.columnOrder
+  if (!order || order.length === 0) return schema
+  const byName = new Map<string, TableSchema['columns'][number]>()
+  for (const c of schema.columns) byName.set(c.name, c)
+  const ordered: TableSchema['columns'] = []
+  for (const name of order) {
+    const c = byName.get(name)
+    if (c) {
+      ordered.push(c)
+      byName.delete(name)
+    }
+  }
+  for (const c of byName.values()) ordered.push(c)
+  return { ...schema, columns: ordered }
+}
+
 export async function getTableById(
   tableId: string,
   options?: { includeArchived?: boolean }
@@ -191,12 +226,13 @@ export async function getTableById(
   if (results.length === 0) return null
 
   const table = results[0]
+  const metadata = (table.metadata as TableMetadata) ?? null
   return {
     id: table.id,
     name: table.name,
     description: table.description,
-    schema: table.schema as TableSchema,
-    metadata: (table.metadata as TableMetadata) ?? null,
+    schema: applyColumnOrderToSchema(table.schema as TableSchema, metadata),
+    metadata,
     rowCount: table.rowCount,
     maxRows: table.maxRows,
     workspaceId: table.workspaceId,
@@ -262,20 +298,23 @@ export async function listTables(
     )
     .orderBy(userTableDefinitions.createdAt)
 
-  return tables.map((t) => ({
-    id: t.id,
-    name: t.name,
-    description: t.description,
-    schema: t.schema as TableSchema,
-    metadata: (t.metadata as TableMetadata) ?? null,
-    rowCount: t.rowCount,
-    maxRows: t.maxRows,
-    workspaceId: t.workspaceId,
-    createdBy: t.createdBy,
-    archivedAt: t.archivedAt,
-    createdAt: t.createdAt,
-    updatedAt: t.updatedAt,
-  }))
+  return tables.map((t) => {
+    const metadata = (t.metadata as TableMetadata) ?? null
+    return {
+      id: t.id,
+      name: t.name,
+      description: t.description,
+      schema: applyColumnOrderToSchema(t.schema as TableSchema, metadata),
+      metadata,
+      rowCount: t.rowCount,
+      maxRows: t.maxRows,
+      workspaceId: t.workspaceId,
+      createdBy: t.createdBy,
+      archivedAt: t.archivedAt,
+      createdAt: t.createdAt,
+      updatedAt: t.updatedAt,
+    }
+  })
 }
 
 /**
@@ -648,9 +687,49 @@ export async function updateTableMetadata(
 ): Promise<TableMetadata> {
   const merged: TableMetadata = { ...(existingMetadata ?? {}), ...metadata }
 
+  // When `columnOrder` is in the patch, scrub any workflow-group dependency
+  // that now sits to the right of (or at the same index as) its group's
+  // leftmost column. Without this, reordering a column could leave a group
+  // depending on a column it can no longer reach in the dag — the group
+  // would never fire.
+  const newOrder = metadata.columnOrder
+  let nextSchema: TableSchema | null = null
+  if (Array.isArray(newOrder) && newOrder.length > 0) {
+    const [tableRow] = await db
+      .select({ schema: userTableDefinitions.schema })
+      .from(userTableDefinitions)
+      .where(eq(userTableDefinitions.id, tableId))
+      .limit(1)
+    if (tableRow) {
+      const schema = tableRow.schema as TableSchema
+      const groups = schema.workflowGroups ?? []
+      if (groups.length > 0) {
+        const positionOf = new Map<string, number>()
+        newOrder.forEach((name, i) => positionOf.set(name, i))
+        let mutated = false
+        const nextGroups = groups.map((group) => {
+          const ownCols = schema.columns.filter((c) => c.workflowGroupId === group.id)
+          let leftmost = Number.POSITIVE_INFINITY
+          for (const c of ownCols) {
+            const idx = positionOf.get(c.name) ?? Number.POSITIVE_INFINITY
+            if (idx < leftmost) leftmost = idx
+          }
+          if (!Number.isFinite(leftmost)) return group
+          const deps = group.dependencies?.columns ?? []
+          const removed = new Set(deps.filter((dep) => (positionOf.get(dep) ?? -1) >= leftmost))
+          if (removed.size === 0) return group
+          const stripped = stripGroupDeps(group, removed)
+          if (stripped !== group) mutated = true
+          return stripped
+        })
+        if (mutated) nextSchema = { ...schema, workflowGroups: nextGroups }
+      }
+    }
+  }
+
   await db
     .update(userTableDefinitions)
-    .set({ metadata: merged })
+    .set(nextSchema ? { metadata: merged, schema: nextSchema } : { metadata: merged })
     .where(eq(userTableDefinitions.id, tableId))
 
   return merged
@@ -915,7 +994,7 @@ export async function insertRow(
   const insertedRow: TableRow = {
     id: row.id,
     data: row.data as RowData,
-    executions: (row.executions as RowExecutions) ?? {},
+    executions: {},
     position: row.position,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
@@ -930,7 +1009,14 @@ export async function insertRow(
     table.schema,
     requestId
   )
-  void scheduleRunsForRows(table, [insertedRow])
+  void runWorkflowColumn({
+    tableId: table.id,
+    workspaceId: table.workspaceId,
+    rowIds: [insertedRow.id],
+    mode: 'new',
+    isManualRun: false,
+    requestId,
+  }).catch((err) => logger.error(`[${requestId}] auto-dispatch (insertRow) failed:`, err))
 
   return insertedRow
 }
@@ -1041,14 +1127,25 @@ export async function batchInsertRowsWithTx(
   const result: TableRow[] = insertedRows.map((r) => ({
     id: r.id,
     data: r.data as RowData,
-    executions: (r.executions as RowExecutions) ?? {},
+    executions: {},
     position: r.position,
     createdAt: r.createdAt,
     updatedAt: r.updatedAt,
   }))
 
   void fireTableTrigger(data.tableId, table.name, 'insert', result, null, table.schema, requestId)
-  void scheduleRunsForRows(table, result)
+  // Scope to the newly-inserted row ids so the dispatcher doesn't walk every
+  // row in the table. After the sidecar migration, all existing rows have
+  // zero entries → `mode:'new'`'s `NOT EXISTS` filter would otherwise include
+  // them, dispatching workflows on every row in a populated table.
+  void runWorkflowColumn({
+    tableId: table.id,
+    workspaceId: table.workspaceId,
+    rowIds: result.map((r) => r.id),
+    mode: 'new',
+    isManualRun: false,
+    requestId,
+  }).catch((err) => logger.error(`[${requestId}] auto-dispatch (batchInsertRows) failed:`, err))
 
   return result
 }
@@ -1322,11 +1419,12 @@ export async function upsertRow(
         .where(eq(userTableRows.id, matchedRowId))
         .returning()
 
+      const executions = await loadExecutionsForRow(trx, updatedRow.id)
       return {
         row: {
           id: updatedRow.id,
           data: updatedRow.data as RowData,
-          executions: (updatedRow.executions as RowExecutions) ?? {},
+          executions,
           position: updatedRow.position,
           createdAt: updatedRow.createdAt,
           updatedAt: updatedRow.updatedAt,
@@ -1354,7 +1452,7 @@ export async function upsertRow(
       row: {
         id: insertedRow.id,
         data: insertedRow.data as RowData,
-        executions: (insertedRow.executions as RowExecutions) ?? {},
+        executions: {},
         position: insertedRow.position,
         createdAt: insertedRow.createdAt,
         updatedAt: insertedRow.updatedAt,
@@ -1389,7 +1487,14 @@ export async function upsertRow(
       requestId
     )
   }
-  void scheduleRunsForRows(table, [result.row])
+  void runWorkflowColumn({
+    tableId: table.id,
+    workspaceId: table.workspaceId,
+    rowIds: [result.row.id],
+    mode: 'new',
+    isManualRun: false,
+    requestId,
+  }).catch((err) => logger.error(`[${requestId}] auto-dispatch (upsertRow) failed:`, err))
 
   return result
 }
@@ -1473,11 +1578,16 @@ export async function queryRows(
     `[${requestId}] Queried ${rows.length} rows from table ${table.id} (total: ${totalCount})`
   )
 
+  const executionsByRow = await loadExecutionsByRow(
+    db,
+    rows.map((r) => r.id)
+  )
+
   return {
     rows: rows.map((r) => ({
       id: r.id,
       data: r.data as RowData,
-      executions: (r.executions as RowExecutions) ?? {},
+      executions: executionsByRow.get(r.id) ?? {},
       position: r.position,
       createdAt: r.createdAt,
       updatedAt: r.updatedAt,
@@ -1517,10 +1627,11 @@ export async function getRowById(
   if (results.length === 0) return null
 
   const row = results[0]
+  const executions = await loadExecutionsForRow(db, row.id)
   return {
     id: row.id,
     data: row.data as RowData,
-    executions: (row.executions as RowExecutions) ?? {},
+    executions,
     position: row.position,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
@@ -1528,36 +1639,94 @@ export async function getRowById(
 }
 
 /**
- * When a user edit clears a workflow output column to empty, also clear the
- * exec record for that group. Without this, a `cancelled` (or `error`) exec
- * sticks on the row even after the user wipes the output, blocking the
- * auto-fire reactor (which respects terminal states). Treating the cleared
- * cell as "user wants this re-armed" matches the rule that cells are the
- * source of truth — we already do this for `completed` via
- * `areOutputsFilled` in the eligibility predicate; this extends the same
- * behavior to error/cancelled by making the data clear remove the exec.
+ * Derive automatic clears + cancellation candidates from a row's data patch.
+ *
+ * Walks `schema.workflowGroups` left-to-right with a propagating `dirtied`
+ * column set. For each group whose deps overlap the dirty set, decide to
+ * clear (terminal exec) or cancel+rerun (in-flight exec), then add the
+ * group's outputs to the dirty set so later groups in the chain see them
+ * as dirty too. This models transitive dep chains as a single forward pass —
+ * editing column A propagates through group 1 (deps on A) to group 2 (deps
+ * on group 1's output) without explicit DAG traversal.
+ *
+ * Returns:
+ * - `executionsPatch`: caller's patch + nulls for cleared groups (or
+ *   undefined if nothing applied).
+ * - `inFlightDownstreamGroups`: groups whose dep was dirtied and that are
+ *   currently in-flight. Cancel-and-restart is the caller's job.
  *
- * Returns a merged `executionsPatch` (caller's patch + null for groups whose
- * outputs were cleared), or the caller's patch unchanged if nothing applies.
+ * Assumption: `workflowGroups[]` is in topological order — a group's deps
+ * may only reference columns to its left (enforced by `workflow-sidebar`'s
+ * "Run after" picker + the reorder scrub via `stripGroupDeps`). Violating
+ * this would silently miss the propagation.
  */
 function deriveExecClearsForDataPatch(
   dataPatch: RowData,
   schema: TableSchema,
+  existingExecutions: RowExecutions,
   callerPatch: Record<string, RowExecutionMetadata | null> | undefined
-): Record<string, RowExecutionMetadata | null> | undefined {
+): {
+  executionsPatch: Record<string, RowExecutionMetadata | null> | undefined
+  inFlightDownstreamGroups: string[]
+} {
+  const dirtied = new Set(Object.keys(dataPatch))
   const groupsToClear = new Set<string>()
+  const inFlightDownstreamGroups: string[] = []
+
+  // Own-output clears: when the user wipes a workflow output column, drop
+  // that group's exec entry so the auto-fire reactor re-arms the cell.
+  // Also flags the cleared output column as dirty so transitive downstream
+  // groups see it.
   for (const [columnName, value] of Object.entries(dataPatch)) {
     const cleared = value === null || value === undefined || value === ''
     if (!cleared) continue
     const col = schema.columns.find((c) => c.name === columnName)
     if (col?.workflowGroupId) groupsToClear.add(col.workflowGroupId)
   }
-  if (groupsToClear.size === 0) return callerPatch
+
+  // Left-to-right walk, propagating dirty columns forward.
+  const groups = schema.workflowGroups ?? []
+  for (const group of groups) {
+    const deps = group.dependencies?.columns ?? []
+    const depMatched = deps.some((d) => dirtied.has(d))
+    if (!depMatched) continue
+
+    const exec = existingExecutions[group.id]
+    if (exec) {
+      const status = exec.status
+      if (status === 'completed' || status === 'error' || status === 'cancelled') {
+        groupsToClear.add(group.id)
+      } else if (status === 'queued' || status === 'running' || status === 'pending') {
+        inFlightDownstreamGroups.push(group.id)
+      }
+    } else {
+      // No exec entry yet — `mode: 'new'` already covers this group. We
+      // still propagate the dirty signal forward so later groups in the
+      // chain see this group's outputs as dirty too.
+      groupsToClear.add(group.id)
+    }
+
+    // Propagate: this group is about to be re-computed, so groups whose
+    // deps reference its output columns are also dirty.
+    for (const out of group.outputs) dirtied.add(out.columnName)
+  }
+
+  if (groupsToClear.size === 0) {
+    return { executionsPatch: callerPatch, inFlightDownstreamGroups }
+  }
   const merged: Record<string, RowExecutionMetadata | null> = { ...(callerPatch ?? {}) }
   for (const gid of groupsToClear) {
     if (!(gid in merged)) merged[gid] = null
   }
-  return merged
+  return { executionsPatch: merged, inFlightDownstreamGroups }
+}
+
+/** Internal: thrown inside `db.transaction` to roll back when the executions
+ *  guard rejects a write. The outer `.catch` translates it into a `null` return. */
+class GuardRejected extends Error {
+  constructor() {
+    super('cell-write guard rejected')
+  }
 }
 
 /** Merges an `executionsPatch` into the row's existing executions blob. */
@@ -1578,50 +1747,172 @@ function applyExecutionsPatch(
 }
 
 /**
- * Builds a SQL expression that applies the given `executionsPatch` to the
- * row's `executions` jsonb in-place — set keys for non-null values, delete
- * keys for `null` values. Returns null when the patch is empty/missing.
+ * Loads `tableRowExecutions` rows for the given row ids and groups them into
+ * a `Map<rowId, RowExecutions>` suitable for plugging into `TableRow.executions`
+ * everywhere callers used to read `userTableRows.executions` JSONB.
+ */
+async function loadExecutionsByRow(
+  trx: DbOrTx,
+  rowIds: Iterable<string>
+): Promise<Map<string, RowExecutions>> {
+  const ids = Array.from(new Set(rowIds))
+  const result = new Map<string, RowExecutions>()
+  if (ids.length === 0) return result
+  const rows = await trx
+    .select()
+    .from(tableRowExecutions)
+    .where(inArray(tableRowExecutions.rowId, ids))
+  for (const r of rows) {
+    const existing = result.get(r.rowId) ?? {}
+    const meta: RowExecutionMetadata = {
+      status: r.status as RowExecutionMetadata['status'],
+      executionId: r.executionId ?? null,
+      jobId: r.jobId ?? null,
+      workflowId: r.workflowId,
+      error: r.error ?? null,
+      ...(r.runningBlockIds && r.runningBlockIds.length > 0
+        ? { runningBlockIds: r.runningBlockIds }
+        : {}),
+      ...(r.blockErrors && Object.keys(r.blockErrors as Record<string, string>).length > 0
+        ? { blockErrors: r.blockErrors as Record<string, string> }
+        : {}),
+      ...(r.cancelledAt ? { cancelledAt: r.cancelledAt.toISOString() } : {}),
+    }
+    existing[r.groupId] = meta
+    result.set(r.rowId, existing)
+  }
+  return result
+}
+
+/** Convenience: load executions for one row, returning `{}` when missing. */
+async function loadExecutionsForRow(trx: DbOrTx, rowId: string): Promise<RowExecutions> {
+  const byRow = await loadExecutionsByRow(trx, [rowId])
+  return byRow.get(rowId) ?? {}
+}
+
+/**
+ * Writes a per-group execution patch for one row against the `tableRowExecutions`
+ * sidecar. Non-null values upsert into the table; nulls delete the entry. When
+ * `guard` is set, the upsert is gated to:
+ *  - reject if a `cancelled` row for the same execution already exists, and
+ *  - reject if the row exists but is owned by a different executionId
+ *    (with carve-outs for missing rows and null executionIds — the dispatcher's
+ *    pre-batch `pending` stamp leaves executionId unset so the first cell-task
+ *    can claim).
  *
- * Why server-side: read-modify-write on the entire jsonb blob races between
- * concurrent writers (e.g., a column edit and a manual-retry stamp), so the
- * last writer wins for keys it didn't touch and clobbers other writers'
- * exec updates. Patching keys at the SQL level keeps each writer's changes
- * atomic per-key.
+ * Returns `'guard-rejected'` when the guarded group's upsert affected 0 rows
+ * (callers signal failure to the cell-task path). Returns `'wrote'` otherwise.
  */
-function buildExecutionsSqlPatch(
-  patch: Record<string, RowExecutionMetadata | null> | undefined
-): SQL | null {
-  if (!patch) return null
+async function writeExecutionsPatch(
+  trx: DbOrTx,
+  tableId: string,
+  rowId: string,
+  patch: Record<string, RowExecutionMetadata | null> | undefined,
+  guard?: { groupId: string; executionId: string }
+): Promise<'wrote' | 'guard-rejected'> {
+  if (!patch) return 'wrote'
   const entries = Object.entries(patch)
-  if (entries.length === 0) return null
+  if (entries.length === 0) return 'wrote'
 
-  let expr: SQL = sql`coalesce(${userTableRows.executions}, '{}'::jsonb)`
   for (const [gid, value] of entries) {
     if (value === null) {
-      expr = sql`(${expr}) - ${gid}::text`
-    } else {
-      expr = sql`(${expr}) || jsonb_build_object(${gid}::text, ${JSON.stringify(value)}::jsonb)`
+      await trx
+        .delete(tableRowExecutions)
+        .where(and(eq(tableRowExecutions.rowId, rowId), eq(tableRowExecutions.groupId, gid)) as SQL)
+      continue
+    }
+    const insertValues = {
+      tableId,
+      rowId,
+      groupId: gid,
+      status: value.status,
+      executionId: value.executionId,
+      jobId: value.jobId,
+      workflowId: value.workflowId,
+      error: value.error,
+      runningBlockIds: value.runningBlockIds ?? [],
+      blockErrors: value.blockErrors ?? {},
+      cancelledAt: value.cancelledAt ? new Date(value.cancelledAt) : null,
+      updatedAt: new Date(),
+    } as const
+
+    const isGuarded = guard && guard.groupId === gid
+    if (isGuarded) {
+      // Gate by guard semantics. The original JSONB guard had two AND'd
+      // clauses; we collapse them onto the upsert's WHERE so a non-matching
+      // existing row leaves the table untouched and we observe 0 affected.
+      const guardExecutionId = guard.executionId
+      const updated = await trx
+        .insert(tableRowExecutions)
+        .values(insertValues)
+        .onConflictDoUpdate({
+          target: [tableRowExecutions.rowId, tableRowExecutions.groupId],
+          set: {
+            status: insertValues.status,
+            executionId: insertValues.executionId,
+            jobId: insertValues.jobId,
+            workflowId: insertValues.workflowId,
+            error: insertValues.error,
+            runningBlockIds: insertValues.runningBlockIds,
+            blockErrors: insertValues.blockErrors,
+            cancelledAt: insertValues.cancelledAt,
+            updatedAt: insertValues.updatedAt,
+          },
+          where: and(
+            // Reject if this group already shows authoritative `cancelled` for
+            // the same executionId — a stop click wrote it first.
+            sql`NOT (${tableRowExecutions.status} = 'cancelled' AND ${tableRowExecutions.executionId} IS NOT DISTINCT FROM ${guardExecutionId})`,
+            // Stale-worker: the cell's active run has moved on. Carve-outs
+            // permit a fresh worker to take over when the row's executionId
+            // is unset (dispatcher's pre-batch `pending` stamp).
+            sql`(${tableRowExecutions.executionId} IS NULL OR ${tableRowExecutions.executionId} = ${guardExecutionId})`
+          ) as SQL,
+        })
+        .returning({ rowId: tableRowExecutions.rowId })
+      if (updated.length === 0) return 'guard-rejected'
+      continue
     }
+
+    await trx
+      .insert(tableRowExecutions)
+      .values(insertValues)
+      .onConflictDoUpdate({
+        target: [tableRowExecutions.rowId, tableRowExecutions.groupId],
+        set: {
+          status: insertValues.status,
+          executionId: insertValues.executionId,
+          jobId: insertValues.jobId,
+          workflowId: insertValues.workflowId,
+          error: insertValues.error,
+          runningBlockIds: insertValues.runningBlockIds,
+          blockErrors: insertValues.blockErrors,
+          cancelledAt: insertValues.cancelledAt,
+          updatedAt: insertValues.updatedAt,
+        },
+      })
   }
-  return expr
+
+  return 'wrote'
 }
 
 /**
- * Strips the given workflow group ids from every row's `executions` jsonb on
- * a table — used by the column / group delete paths so stale running/queued
- * exec records don't linger and inflate counters after the group is gone.
- * The caller wraps in their own transaction.
+ * Strips the given workflow group ids from every row's executions on a table —
+ * used by the column / group delete paths so stale running/queued exec records
+ * don't linger and inflate counters after the group is gone. The caller wraps
+ * in their own transaction.
  */
 async function stripGroupExecutions(
-  trx: Parameters<Parameters<typeof db.transaction>[0]>[0],
+  trx: DbOrTx,
   tableId: string,
   groupIds: Iterable<string>
 ): Promise<void> {
-  for (const gid of groupIds) {
-    await trx.execute(
-      sql`UPDATE user_table_rows SET executions = executions - ${gid}::text WHERE table_id = ${tableId} AND executions ? ${gid}::text`
+  const ids = Array.from(new Set(groupIds))
+  if (ids.length === 0) return
+  await trx
+    .delete(tableRowExecutions)
+    .where(
+      and(eq(tableRowExecutions.tableId, tableId), inArray(tableRowExecutions.groupId, ids)) as SQL
     )
-  }
 }
 
 /**
@@ -1649,13 +1940,16 @@ export async function updateRow(
     ...(existingRow.data as RowData),
     ...data.data,
   }
-  // Auto-clear exec records for workflow output columns the user just wiped,
-  // so the auto-fire reactor sees no exec and re-arms the cell.
-  const effectiveExecutionsPatch = deriveExecClearsForDataPatch(
-    data.data,
-    table.schema,
-    data.executionsPatch
-  )
+  // Auto-clear exec records for workflow output columns the user just wiped
+  // AND for downstream groups whose deps just changed. Surfaces the in-flight
+  // downstream groups so the caller can cancel + re-run them.
+  const { executionsPatch: effectiveExecutionsPatch, inFlightDownstreamGroups } =
+    deriveExecClearsForDataPatch(
+      data.data,
+      table.schema,
+      existingRow.executions,
+      data.executionsPatch
+    )
   const mergedExecutions = applyExecutionsPatch(existingRow.executions, effectiveExecutionsPatch)
 
   // Validate size
@@ -1686,52 +1980,40 @@ export async function updateRow(
 
   const now = new Date()
 
-  // Cell-task partial writes pass `cancellationGuard` so the SQL update is a
-  // no-op when (a) a stop click already wrote `cancelled` for this run, or
-  // (b) a newer run has taken over the cell with a different executionId. The
-  // worker is "this run's writes only land if this run is still the active
-  // run on the cell." Authoritative cancel writes from `cancelWorkflowGroupRuns`
-  // skip the guard entirely (they don't pass `cancellationGuard`).
-  //
-  // SQL-level for atomicity: an in-process read + update would race a
-  // concurrent stop or rerun. The two clauses are joined by AND because
-  // either failing means the worker is no longer authoritative.
+  // Cell-task partial writes pass `cancellationGuard` so the upsert into
+  // `tableRowExecutions` is a no-op when (a) a stop click already wrote
+  // `cancelled` for this run, or (b) a newer run has taken over the cell
+  // with a different executionId. Authoritative cancel writes from
+  // `cancelWorkflowGroupRuns` skip the guard entirely. Data + executions
+  // commit in one transaction so a partial write can't leave the sidecar
+  // and the row out of sync.
   const guard = data.cancellationGuard
-  const whereClause = guard
-    ? and(
-        eq(userTableRows.id, data.rowId),
-        // Reject writes that would land on top of an already-`cancelled` state
-        // for this same run. Wrapped in IS DISTINCT FROM so a missing exec
-        // (NULL) cleanly evaluates as "different" rather than NULL-poisoning.
-        sql`(executions->${guard.groupId}->>'status' IS DISTINCT FROM 'cancelled' OR executions->${guard.groupId}->>'executionId' IS DISTINCT FROM ${guard.executionId})`,
-        // Reject writes from a stale worker — the cell's active run has moved
-        // on. `OR exec IS NULL` lets the worker land its first `running`
-        // stamp on a row that has no prior exec record (initial stamp from
-        // the scheduler may not have committed yet).
-        sql`(executions->${guard.groupId} IS NULL OR executions->${guard.groupId}->>'executionId' = ${guard.executionId})`
+  const guardRejected = await db
+    .transaction(async (trx) => {
+      await trx
+        .update(userTableRows)
+        .set({ data: mergedData, updatedAt: now })
+        .where(eq(userTableRows.id, data.rowId))
+
+      const result = await writeExecutionsPatch(
+        trx,
+        data.tableId,
+        data.rowId,
+        effectiveExecutionsPatch,
+        guard
       )
-    : eq(userTableRows.id, data.rowId)
-
-  // Apply the executions patch at the SQL level — we never overwrite the full
-  // executions blob, only the keys the caller explicitly patched. Without
-  // this, concurrent updateRow calls (e.g., a column edit and a manual
-  // retry's stamp) would each compute `mergedExecutions` from their own
-  // in-memory snapshot and the last writer wins, clobbering the other's
-  // exec keys. The data field still does last-writer-wins because that's
-  // the user's edit, but exec records are independently keyed by groupId.
-  const executionsExpr = buildExecutionsSqlPatch(effectiveExecutionsPatch)
-  const updated = await db
-    .update(userTableRows)
-    .set({
-      data: mergedData,
-      ...(executionsExpr ? { executions: executionsExpr } : {}),
-      updatedAt: now,
+      if (result === 'guard-rejected') {
+        // Roll back the data update too — the worker isn't authoritative.
+        throw new GuardRejected()
+      }
+      return false
+    })
+    .catch((err) => {
+      if (err instanceof GuardRejected) return true
+      throw err
     })
-    .where(whereClause)
-    .returning({ id: userTableRows.id })
 
-  // Only meaningful when a guard is set — `null` signals "guard rejected".
-  if (guard && updated.length === 0) {
+  if (guardRejected) {
     return null
   }
 
@@ -1756,9 +2038,54 @@ export async function updateRow(
     table.schema,
     requestId
   )
-  // Awaited (not `void`) so cell tasks dispatch their cascade before the
-  // trigger.dev worker tears down on `run()` resolve.
-  if (!data.skipScheduler) await scheduleRunsForRows(table, [updatedRow])
+
+  // Auto-fire only on user-facing data edits. Internal callers that mutate
+  // executions (cell-task partial/terminal writes, cancel writes) always pass
+  // `executionsPatch` — re-dispatching from those would recursively spawn new
+  // dispatches for every running/terminal write, flooding the dispatcher with
+  // redundant pre-stamps that strand `pending` cells.
+  const isInternalExecWrite = data.executionsPatch && Object.keys(data.executionsPatch).length > 0
+  if (isInternalExecWrite) {
+    return updatedRow
+  }
+
+  // Two passes:
+  //  1. Cancel in-flight downstream groups whose dep just changed, then
+  //     manually re-run them — the cancel writes `cancelled` per cell and
+  //     `mode: 'incomplete' + isManualRun: true` wipes those entries and
+  //     re-enqueues.
+  //  2. `mode: 'new'` for groups that just had their exec entries cleared
+  //     (own-output wipe OR terminal downstream dep-changed) — the
+  //     dispatcher's `jsonb_exists_all` SQL filter lets the row through
+  //     because at least one targeted group's exec is now missing.
+  if (inFlightDownstreamGroups.length > 0) {
+    void (async () => {
+      try {
+        await cancelWorkflowGroupRuns(data.tableId, data.rowId, {
+          groupIds: inFlightDownstreamGroups,
+        })
+        await runWorkflowColumn({
+          tableId: data.tableId,
+          workspaceId: data.workspaceId,
+          mode: 'incomplete',
+          isManualRun: true,
+          rowIds: [data.rowId],
+          groupIds: inFlightDownstreamGroups,
+          requestId,
+        })
+      } catch (err) {
+        logger.error(`[${requestId}] cancel+rerun for in-flight downstream groups failed:`, err)
+      }
+    })()
+  }
+  void runWorkflowColumn({
+    tableId: data.tableId,
+    workspaceId: data.workspaceId,
+    rowIds: [data.rowId],
+    mode: 'new',
+    isManualRun: false,
+    requestId,
+  }).catch((err) => logger.error(`[${requestId}] auto-dispatch (updateRow) failed:`, err))
 
   return updatedRow
 }
@@ -1906,7 +2233,7 @@ export async function updateRowsByFilter(
   const updatedRows: TableRow[] = matchingRows.map((r) => ({
     id: r.id,
     data: { ...(r.data as RowData), ...data.data },
-    executions: ((r as { executions?: unknown }).executions as RowExecutions) ?? {},
+    executions: {},
     position: 0,
     createdAt: now,
     updatedAt: now,
@@ -1920,7 +2247,14 @@ export async function updateRowsByFilter(
     table.schema,
     requestId
   )
-  void scheduleRunsForRows(table, updatedRows)
+  void runWorkflowColumn({
+    tableId: table.id,
+    workspaceId: table.workspaceId,
+    rowIds: updatedRows.map((r) => r.id),
+    mode: 'new',
+    isManualRun: false,
+    requestId,
+  }).catch((err) => logger.error(`[${requestId}] auto-dispatch (updateRowsByFilter) failed:`, err))
 
   return {
     affectedCount: matchingRows.length,
@@ -1946,7 +2280,6 @@ export async function batchUpdateRows(
     .select({
       id: userTableRows.id,
       data: userTableRows.data,
-      executions: userTableRows.executions,
     })
     .from(userTableRows)
     .where(
@@ -1957,11 +2290,16 @@ export async function batchUpdateRows(
       )
     )
 
+  const executionsByRow = await loadExecutionsByRow(
+    db,
+    existingRows.map((r) => r.id)
+  )
+
   type ExistingRow = { data: RowData; executions: RowExecutions }
   const existingMap = new Map<string, ExistingRow>(
     existingRows.map((r) => [
       r.id,
-      { data: r.data as RowData, executions: (r.executions as RowExecutions) ?? {} },
+      { data: r.data as RowData, executions: executionsByRow.get(r.id) ?? {} },
     ])
   )
 
@@ -1975,17 +2313,22 @@ export async function batchUpdateRows(
     mergedData: RowData
     mergedExecutions: RowExecutions
     executionsPatch?: Record<string, RowExecutionMetadata | null>
+    inFlightDownstreamGroups: string[]
   }> = []
   for (const update of data.updates) {
     const existing = existingMap.get(update.rowId)!
     const merged = { ...existing.data, ...update.data }
     // Auto-clear exec records for workflow output columns the user just
-    // wiped — same rationale as `updateRow`.
-    const effectiveExecutionsPatch = deriveExecClearsForDataPatch(
-      update.data,
-      table.schema,
-      update.executionsPatch
-    )
+    // wiped AND downstream dep-changed terminal groups — same rationale as
+    // `updateRow`. Per-row in-flight downstream groups are surfaced so we
+    // can run the cancel+rerun orchestration after the batch commits.
+    const { executionsPatch: effectiveExecutionsPatch, inFlightDownstreamGroups } =
+      deriveExecClearsForDataPatch(
+        update.data,
+        table.schema,
+        existing.executions,
+        update.executionsPatch
+      )
     const mergedExecutions = applyExecutionsPatch(existing.executions, effectiveExecutionsPatch)
 
     const sizeValidation = validateRowSize(merged)
@@ -2003,6 +2346,7 @@ export async function batchUpdateRows(
       mergedData: merged,
       mergedExecutions,
       executionsPatch: effectiveExecutionsPatch,
+      inFlightDownstreamGroups,
     })
   }
 
@@ -2027,21 +2371,18 @@ export async function batchUpdateRows(
     await setTableTxTimeouts(trx, { statementMs: 60_000 })
     for (let i = 0; i < mergedUpdates.length; i += TABLE_LIMITS.UPDATE_BATCH_SIZE) {
       const batch = mergedUpdates.slice(i, i + TABLE_LIMITS.UPDATE_BATCH_SIZE)
-      // Same as `updateRow`: patch executions at the SQL level when a patch
-      // is set, so concurrent writers don't clobber each other's keys via
-      // last-writer-wins on the full jsonb blob.
-      const updatePromises = batch.map(({ rowId, mergedData, executionsPatch }) => {
-        const executionsExpr = buildExecutionsSqlPatch(executionsPatch)
-        return trx
+      // Update row data in parallel; sidecar exec writes are sequential per
+      // row (each goes through writeExecutionsPatch's per-key upsert).
+      const dataPromises = batch.map(({ rowId, mergedData }) =>
+        trx
           .update(userTableRows)
-          .set({
-            data: mergedData,
-            ...(executionsExpr ? { executions: executionsExpr } : {}),
-            updatedAt: now,
-          })
+          .set({ data: mergedData, updatedAt: now })
           .where(eq(userTableRows.id, rowId))
-      })
-      await Promise.all(updatePromises)
+      )
+      await Promise.all(dataPromises)
+      for (const { rowId, executionsPatch } of batch) {
+        await writeExecutionsPatch(trx, data.tableId, rowId, executionsPatch)
+      }
     }
   })
 
@@ -2069,7 +2410,47 @@ export async function batchUpdateRows(
     table.schema,
     requestId
   )
-  if (!data.skipScheduler) void scheduleRunsForRows(table, updatedRowsForTrigger)
+  // Per-row cancel+rerun for in-flight downstream groups whose deps just
+  // changed — same orchestration as single-row `updateRow`. Without this,
+  // batch updates would leave running workflows reading stale dep values.
+  // Each row needs its own cancel + manual-incomplete dispatch because
+  // `cancelWorkflowGroupRuns`'s `groupIds` filter is per-row.
+  const rowsWithInFlightDownstream = mergedUpdates.filter(
+    (u) => u.inFlightDownstreamGroups.length > 0
+  )
+  if (rowsWithInFlightDownstream.length > 0) {
+    void (async () => {
+      try {
+        for (const { rowId, inFlightDownstreamGroups } of rowsWithInFlightDownstream) {
+          await cancelWorkflowGroupRuns(data.tableId, rowId, {
+            groupIds: inFlightDownstreamGroups,
+          })
+          await runWorkflowColumn({
+            tableId: data.tableId,
+            workspaceId: data.workspaceId,
+            mode: 'incomplete',
+            isManualRun: true,
+            rowIds: [rowId],
+            groupIds: inFlightDownstreamGroups,
+            requestId,
+          })
+        }
+      } catch (err) {
+        logger.error(
+          `[${requestId}] cancel+rerun for in-flight downstream groups (batch) failed:`,
+          err
+        )
+      }
+    })()
+  }
+  void runWorkflowColumn({
+    tableId: table.id,
+    workspaceId: table.workspaceId,
+    rowIds: updatedRowsForTrigger.map((r) => r.id),
+    mode: 'new',
+    isManualRun: false,
+    requestId,
+  }).catch((err) => logger.error(`[${requestId}] auto-dispatch (batchUpdateRows) failed:`, err))
 
   return {
     affectedCount: mergedUpdates.length,
@@ -2789,18 +3170,20 @@ export async function addWorkflowGroup(
     updatedAt: now,
   }
 
-  // Schedule existing rows so already-filled deps trigger immediately. Skipped
-  // when the caller opted out (Mothership stages groups silently — `autoRun:
-  // false` — so the AI can compose multiple changes without firing rows mid-edit).
-  // Awaited (not `void`) so the response includes the queued exec state — the
-  // client's post-mutation refetch otherwise lands before the stamps commit
-  // and the rows query polling never starts.
+  // Auto-fire existing rows whose deps are already met for the new group.
+  // Fire-and-forget — the dispatcher bounds queue depth (window of 20) and
+  // walks the table in the background. HTTP returns instantly; cells fill
+  // in over the next minutes as the dispatcher walks. Mothership opts out
+  // by setting `autoRun: false`.
   if (data.autoRun !== false) {
-    try {
-      await scheduleRunsForTable(updatedTable)
-    } catch (err) {
-      logger.error(`[${requestId}] Failed to schedule runs after group add:`, err)
-    }
+    void runWorkflowColumn({
+      tableId: updatedTable.id,
+      workspaceId: updatedTable.workspaceId,
+      mode: 'new',
+      isManualRun: false,
+      groupIds: [data.group.id],
+      requestId,
+    }).catch((err) => logger.error(`[${requestId}] auto-dispatch (addWorkflowGroup) failed:`, err))
   }
 
   return updatedTable
@@ -3086,16 +3469,20 @@ export async function updateWorkflowGroup(
     }
   }
 
-  // autoRun toggled false → true: fire deps-satisfied rows now. Mirrors the
-  // post-add scheduling path so re-enabling auto-fire doesn't require manual
-  // run clicks for rows that are already eligible. Awaited so the post-
-  // mutation refetch sees the queued exec stamps.
+  // autoRun toggled false → true: fire deps-satisfied rows now via the
+  // dispatcher. Mirrors the post-add path so re-enabling auto-fire doesn't
+  // require manual run clicks for rows that are already eligible.
   if (group.autoRun === false && data.autoRun === true) {
-    try {
-      await scheduleRunsForTable(updatedTable, { groupId: data.groupId })
-    } catch (err) {
-      logger.error(`[${requestId}] Failed to schedule runs after autoRun toggled on:`, err)
-    }
+    void runWorkflowColumn({
+      tableId: updatedTable.id,
+      workspaceId: updatedTable.workspaceId,
+      mode: 'new',
+      isManualRun: false,
+      groupIds: [data.groupId],
+      requestId,
+    }).catch((err) =>
+      logger.error(`[${requestId}] auto-dispatch (updateWorkflowGroup autoRun=true) failed:`, err)
+    )
   }
 
   return updatedTable
@@ -3492,20 +3879,40 @@ async function backfillGroupOutputsFromLogs(opts: {
 
   const { pluckByPath } = await import('./pluck')
 
-  const rowRecords = await db
-    .select()
-    .from(userTableRows)
-    .where(eq(userTableRows.tableId, table.id))
+  // Find rows whose group execution completed and grab their executionId
+  // directly from the sidecar — hits the (table_id, group_id) index, no
+  // table scan over rowdata.
+  const completedExecs = await db
+    .select({
+      rowId: tableRowExecutions.rowId,
+      executionId: tableRowExecutions.executionId,
+    })
+    .from(tableRowExecutions)
+    .where(
+      and(
+        eq(tableRowExecutions.tableId, table.id),
+        eq(tableRowExecutions.groupId, groupId),
+        eq(tableRowExecutions.status, 'completed')
+      )
+    )
 
-  // Collect unique executionIds across rows whose group execution completed.
   const executionIdsByRow = new Map<string, string>()
-  for (const r of rowRecords) {
-    const exec = (r.executions as RowExecutions)?.[groupId]
-    if (!exec || exec.status !== 'completed' || !exec.executionId) continue
-    executionIdsByRow.set(r.id, exec.executionId)
+  for (const e of completedExecs) {
+    if (!e.executionId) continue
+    executionIdsByRow.set(e.rowId, e.executionId)
   }
   if (executionIdsByRow.size === 0) return
 
+  const rowRecords = await db
+    .select({ id: userTableRows.id, data: userTableRows.data })
+    .from(userTableRows)
+    .where(
+      and(
+        eq(userTableRows.tableId, table.id),
+        inArray(userTableRows.id, Array.from(executionIdsByRow.keys()))
+      )
+    )
+
   const executionIds = Array.from(new Set(executionIdsByRow.values()))
   const logs = await db
     .select({
@@ -3525,9 +3932,9 @@ async function backfillGroupOutputsFromLogs(opts: {
 
   const updates: Array<{ rowId: string; data: RowData }> = []
   for (const r of rowRecords) {
-    const exec = (r.executions as RowExecutions)?.[groupId]
-    if (!exec?.executionId) continue
-    const log = logByExecutionId.get(exec.executionId)
+    const execId = executionIdsByRow.get(r.id)
+    if (!execId) continue
+    const log = logByExecutionId.get(execId)
     if (!log) continue
 
     const dataPatch: RowData = {}
diff --git a/apps/sim/lib/table/types.ts b/apps/sim/lib/table/types.ts
index 52e81b73f77..09fd6fcfb9c 100644
--- a/apps/sim/lib/table/types.ts
+++ b/apps/sim/lib/table/types.ts
@@ -70,9 +70,9 @@ export interface WorkflowGroup {
 }
 
 /**
- * Per-row execution state for one workflow group, stored in
- * `userTableRows.executions[groupId]`. Holds run metadata only — picked
- * values land in `row.data` directly.
+ * Per-row execution state for one workflow group, persisted as a row in the
+ * `tableRowExecutions` sidecar keyed by `(rowId, groupId)`. Holds run
+ * metadata only — picked output values land in `row.data` directly.
  */
 export interface RowExecutionMetadata {
   status: 'pending' | 'queued' | 'running' | 'completed' | 'error' | 'cancelled'
@@ -94,6 +94,10 @@ export interface RowExecutionMetadata {
    * block should render `Error`, not every output column.
    */
   blockErrors?: Record<string, string>
+  /** ISO timestamp set when a cell is cancelled. The dispatcher skips
+   *  re-runs whose `cancelledAt > dispatch.requestedAt` — a user cancel
+   *  mid-dispatch must not be overridden by `isManualRun`. */
+  cancelledAt?: string
 }
 
 /** Map of `WorkflowGroup.id` → execution state. Stored on every row. */
@@ -295,9 +299,10 @@ export interface UpdateRowData {
   data: RowData
   workspaceId: string
   /**
-   * Optional partial patch to merge into `userTableRows.executions`. Top-level
-   * keys are `WorkflowGroup.id`; pass `null` for a key to delete that group's
-   * execution state. Used by the cell task and cancel paths.
+   * Optional partial patch to apply to the row's `tableRowExecutions`
+   * entries. Top-level keys are `WorkflowGroup.id`; pass `null` for a key
+   * to delete that group's execution row. Used by the cell task and cancel
+   * paths.
    */
   executionsPatch?: Record<string, RowExecutionMetadata | null>
   /**
@@ -308,14 +313,6 @@ export interface UpdateRowData {
    * state. `updateRow` returns `null` when the guard rejects the write.
    */
   cancellationGuard?: { groupId: string; executionId: string }
-  /**
-   * When true, the post-write `scheduleRunsForRows` call is skipped. Used by
-   * the cancel path (which is tearing rows down, not waking them up) and by
-   * the manual-run path (which fires its own `scheduleRunsForRows` with
-   * `isManualRun: true` and doesn't want a duplicate auto-fire pass on the
-   * cleared cells). Default false: every other write fires the reactor.
-   */
-  skipScheduler?: boolean
 }
 
 export interface BulkUpdateData {
@@ -332,8 +329,6 @@ export interface BatchUpdateByIdData {
     executionsPatch?: Record<string, RowExecutionMetadata | null>
   }>
   workspaceId: string
-  /** Same semantics as `UpdateRowData.skipScheduler`. */
-  skipScheduler?: boolean
 }
 
 export interface BulkDeleteData {
diff --git a/apps/sim/lib/table/workflow-columns.ts b/apps/sim/lib/table/workflow-columns.ts
index da912e9d32e..686f97dbc6e 100644
--- a/apps/sim/lib/table/workflow-columns.ts
+++ b/apps/sim/lib/table/workflow-columns.ts
@@ -6,14 +6,14 @@
  */
 
 import { db } from '@sim/db'
-import { pausedExecutions, userTableRows } from '@sim/db/schema'
+import { pausedExecutions, tableRowExecutions, type userTableRows } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
-import { and, asc, eq, inArray, sql } from 'drizzle-orm'
-import { getJobQueue } from '@/lib/core/async-jobs/config'
+import { and, eq, inArray, sql } from 'drizzle-orm'
 import type { EnqueueOptions } from '@/lib/core/async-jobs/types'
-import { buildCancelledExecution, writeWorkflowGroupState } from '@/lib/table/cell-write'
+import { isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
+import { buildCancelledExecution } from '@/lib/table/cell-write'
 import type {
   RowData,
   RowExecutionMetadata,
@@ -27,6 +27,7 @@ import type {
 const logger = createLogger('WorkflowGroupScheduler')
 
 import { areGroupDepsSatisfied, areOutputsFilled, isExecInFlight } from './deps'
+import type { DispatchMode } from './dispatcher'
 
 export {
   getUnmetGroupDeps,
@@ -54,14 +55,16 @@ export type EligibilityReason =
   | 'in-flight'
   | 'completed-on-auto'
   | 'error-on-auto'
+  | 'cancelled-on-auto'
   | 'completed-on-incomplete'
+  | 'has-prior-attempt'
   | 'manual-bypass'
   | 'deps-unmet'
 
 export function classifyEligibility(
   group: WorkflowGroup,
   row: TableRow,
-  opts?: { isManualRun?: boolean; mode?: 'all' | 'incomplete' }
+  opts?: { isManualRun?: boolean; mode?: DispatchMode }
 ): EligibilityReason {
   const isManualRun = opts?.isManualRun ?? false
   const mode = opts?.mode ?? 'all'
@@ -69,14 +72,27 @@ export function classifyEligibility(
   if (group.autoRun === false && !isManualRun) return 'autoRun-off'
 
   const exec = row.executions?.[group.id]
-  if (isExecInFlight(exec)) return 'in-flight'
+  // Dispatcher pre-stamp orphans (`pending` + `executionId: null`) are
+  // placeholders left behind when a previous dispatcher loop wrote the stamp
+  // but no cell-task picked up (cascade-lock contention, trigger.dev queue
+  // failure, etc.). Treat them as claimable so a new dispatcher can re-enqueue
+  // — without this carve-out the row would render "Queued" forever. Matches
+  // the `pickNextEligibleGroupForRow` cascade-loop carve-out.
+  const isOrphanPreStamp = exec?.status === 'pending' && exec.executionId == null
+  if (!isOrphanPreStamp && isExecInFlight(exec)) return 'in-flight'
   const status = exec?.status
 
+  // `mode: 'new'` is the auto-fire scope: only rows that have never been
+  // attempted on this group run. Any pre-existing exec entry — completed,
+  // cancelled, or error — keeps the cell sticky until the user manually
+  // re-runs via "Run column" / "Run all rows" / "Run this row".
+  // Exception: orphan pre-stamps are claimable (handled above).
+  if (mode === 'new' && exec && !isOrphanPreStamp) return 'has-prior-attempt'
+
   const completedAndFilled = status === 'completed' && areOutputsFilled(group, row)
   if (!isManualRun && completedAndFilled) return 'completed-on-auto'
-  // Auto-fire skips `error` to avoid infinite-retry loops on a deterministic
-  // failure. `cancelled` is left runnable — cancellation is user-initiated.
   if (!isManualRun && status === 'error') return 'error-on-auto'
+  if (!isManualRun && status === 'cancelled') return 'cancelled-on-auto'
   if (mode === 'incomplete' && completedAndFilled) return 'completed-on-incomplete'
 
   if (isManualRun && group.autoRun === false) return 'manual-bypass'
@@ -92,6 +108,35 @@ export function isGroupEligible(
   return reason === 'eligible' || reason === 'manual-bypass'
 }
 
+/** Walks a row's workflow groups (in `workflowGroups` order) and returns the
+ *  first one whose deps are met and that isn't already in-flight under a
+ *  different worker. Skips `excludeGroupId` (the group we just finished in
+ *  the cascade loop, to prevent self-retrigger). The cascade-loop is allowed
+ *  to claim past a dispatcher pre-stamp (`pending` with `executionId: null`)
+ *  — that's a placeholder, not a real worker claim. */
+export function pickNextEligibleGroupForRow(
+  table: TableDefinition,
+  row: TableRow,
+  excludeGroupId?: string
+): WorkflowGroup | null {
+  const groups = table.schema.workflowGroups ?? []
+  for (const group of groups) {
+    if (group.id === excludeGroupId) continue
+    const exec = row.executions?.[group.id]
+    // Dispatcher pre-stamp (pending + executionId: null) is a placeholder; the
+    // cascade-loop is the right owner of the claim. Treat as "claimable" by
+    // pretending the exec doesn't exist for the eligibility check.
+    const effectiveRow =
+      exec?.status === 'pending' && exec.executionId == null
+        ? { ...row, executions: { ...row.executions, [group.id]: undefined } as RowExecutions }
+        : row
+    if (isGroupEligible(group, effectiveRow, { isManualRun: false, mode: 'incomplete' })) {
+      return group
+    }
+  }
+  return null
+}
+
 /**
  * Shared options for the three `scheduleRuns*` entry points. `isManualRun`
  * flips two gates in the eligibility predicate so a manual click can re-run
@@ -101,177 +146,153 @@ export interface ScheduleOpts {
   groupId?: string
   groupIds?: string[]
   isManualRun?: boolean
-  mode?: 'all' | 'incomplete'
+  mode?: DispatchMode
 }
 
-/**
- * Re-evaluate eligibility on these specific rows and enqueue runnable cells.
- * The hot path: every row write (insert / update / cascade) calls this with the
- * just-written row(s).
- */
-export async function scheduleRunsForRows(
+/** Pure eligibility filter + payload building. Shared by the auto-fire path
+ *  (`scheduleRunsForRows`) and the dispatcher's per-window batch path. */
+export function buildPendingRuns(
   table: TableDefinition,
   rows: TableRow[],
   opts?: ScheduleOpts
-): Promise<{ triggered: number }> {
-  try {
-    const allGroups = table.schema.workflowGroups ?? []
-    if (allGroups.length === 0) return { triggered: 0 }
-    if (rows.length === 0) return { triggered: 0 }
-
-    const groupIdFilter = opts?.groupIds
-      ? new Set(opts.groupIds)
-      : opts?.groupId
-        ? new Set([opts.groupId])
-        : null
-    const groups = groupIdFilter ? allGroups.filter((g) => groupIdFilter.has(g.id)) : allGroups
-    if (groups.length === 0) return { triggered: 0 }
-
-    const orderedRows = rows.length <= 1 ? rows : [...rows].sort((a, b) => a.position - b.position)
-
-    const pendingRuns: RunGroupCellOptions[] = []
-    const reasonCounts: Partial<Record<EligibilityReason, number>> = {}
-
-    for (const row of orderedRows) {
-      for (const group of groups) {
-        const reason = classifyEligibility(group, row, {
-          isManualRun: opts?.isManualRun,
-          mode: opts?.mode,
-        })
-        reasonCounts[reason] = (reasonCounts[reason] ?? 0) + 1
-        if (reason !== 'eligible' && reason !== 'manual-bypass') continue
-        pendingRuns.push({
-          tableId: table.id,
-          tableName: table.name,
-          rowId: row.id,
-          groupId: group.id,
-          workflowId: group.workflowId,
-          workspaceId: table.workspaceId,
-          executionId: generateId(),
-        })
-      }
+): WorkflowGroupCellPayload[] {
+  const allGroups = table.schema.workflowGroups ?? []
+  if (allGroups.length === 0) return []
+  if (rows.length === 0) return []
+
+  const groupIdFilter = opts?.groupIds
+    ? new Set(opts.groupIds)
+    : opts?.groupId
+      ? new Set([opts.groupId])
+      : null
+  const groups = groupIdFilter ? allGroups.filter((g) => groupIdFilter.has(g.id)) : allGroups
+  if (groups.length === 0) return []
+
+  const orderedRows = rows.length <= 1 ? rows : [...rows].sort((a, b) => a.position - b.position)
+
+  const pendingRuns: WorkflowGroupCellPayload[] = []
+  const reasonCounts: Partial<Record<EligibilityReason, number>> = {}
+
+  for (const row of orderedRows) {
+    for (const group of groups) {
+      const reason = classifyEligibility(group, row, {
+        isManualRun: opts?.isManualRun,
+        mode: opts?.mode,
+      })
+      reasonCounts[reason] = (reasonCounts[reason] ?? 0) + 1
+      if (reason !== 'eligible' && reason !== 'manual-bypass') continue
+      pendingRuns.push({
+        tableId: table.id,
+        tableName: table.name,
+        rowId: row.id,
+        groupId: group.id,
+        workflowId: group.workflowId,
+        workspaceId: table.workspaceId,
+        executionId: generateId(),
+      })
     }
+  }
 
-    logger.debug(
-      `[Cascade] table=${table.id} rows=${rows.length} groups=${groups.length} manual=${opts?.isManualRun ?? false} mode=${opts?.mode ?? 'all'} reasons=${JSON.stringify(reasonCounts)}`
-    )
-
-    if (pendingRuns.length === 0) return { triggered: 0 }
+  logger.debug(
+    `[Cascade] table=${table.id} rows=${rows.length} groups=${groups.length} manual=${opts?.isManualRun ?? false} mode=${opts?.mode ?? 'all'} reasons=${JSON.stringify(reasonCounts)}`
+  )
 
-    logger.info(`Scheduling ${pendingRuns.length} workflow group cell run(s) for table=${table.id}`)
+  return pendingRuns
+}
 
-    const queue = await getJobQueue()
-    const { executeWorkflowGroupCellJob } = await import('@/background/workflow-column-execution')
-    const items = pendingRuns.map((runOpts) => ({
-      payload: runOpts,
-      options: {
-        metadata: {
+/** Build the per-cell `{payload, options}` items for `queue.batchEnqueue` /
+ *  `queue.batchEnqueueAndWait`. Hydrates trigger.dev tags, concurrency keys,
+ *  the inline runner, and the cancel key the inline backend uses to map a
+ *  Stop click to the in-flight cell's AbortController. */
+export async function buildEnqueueItems(
+  pendingRuns: WorkflowGroupCellPayload[]
+): Promise<Array<{ payload: WorkflowGroupCellPayload; options: EnqueueOptions }>> {
+  const { executeWorkflowGroupCellJob } = await import('@/background/workflow-column-execution')
+  return pendingRuns.map((runOpts) => ({
+    payload: runOpts,
+    options: {
+      metadata: {
+        workflowId: runOpts.workflowId,
+        workspaceId: runOpts.workspaceId,
+        correlation: {
+          executionId: runOpts.executionId,
+          requestId: `wfgrp-${runOpts.executionId}`,
+          source: 'workflow' as const,
           workflowId: runOpts.workflowId,
-          workspaceId: runOpts.workspaceId,
-          correlation: {
-            executionId: runOpts.executionId,
-            requestId: `wfgrp-${runOpts.executionId}`,
-            source: 'workflow' as const,
-            workflowId: runOpts.workflowId,
-            triggerType: 'table',
-          },
+          triggerType: 'table',
         },
-        concurrencyKey: runOpts.tableId,
-        concurrencyLimit: TABLE_CONCURRENCY_LIMIT,
-        tags: [`tableId:${runOpts.tableId}`, `rowId:${runOpts.rowId}`, `group:${runOpts.groupId}`],
-        runner: executeWorkflowGroupCellJob as EnqueueOptions['runner'],
       },
-    }))
-
-    let jobIds: string[]
-    try {
-      jobIds = await queue.batchEnqueue('workflow-group-cell', items)
-    } catch (err) {
-      logger.error(`Batch enqueue failed for table=${table.id}:`, err)
-      await Promise.allSettled(
-        pendingRuns.map((runOpts) =>
-          writeWorkflowGroupState(runOpts, {
-            executionState: {
-              status: 'error',
-              executionId: runOpts.executionId,
-              jobId: null,
-              workflowId: runOpts.workflowId,
-              error: toError(err).message,
-            },
-          })
-        )
-      )
-      return { triggered: 0 }
-    }
-
-    // Stamp `queued` in chunks of `TABLE_CONCURRENCY_LIMIT`. Within a chunk we
-    // parallelize the writes (no ordering constraint); across chunks we await
-    // serially so trigger.dev still picks rows up in submission order — the
-    // concurrency cap means at most one chunk is in flight per table anyway.
-    for (let i = 0; i < pendingRuns.length; i += TABLE_CONCURRENCY_LIMIT) {
-      const chunk = pendingRuns.slice(i, i + TABLE_CONCURRENCY_LIMIT)
-      const ids = jobIds.slice(i, i + TABLE_CONCURRENCY_LIMIT)
-      await Promise.all(chunk.map((run, j) => stampQueuedOrCancel(queue, run, ids[j])))
-    }
-    return { triggered: pendingRuns.length }
-  } catch (err) {
-    logger.error('scheduleRunsForRows failed:', err)
-    return { triggered: 0 }
-  }
+      concurrencyKey: runOpts.tableId,
+      concurrencyLimit: TABLE_CONCURRENCY_LIMIT,
+      tags: cellTagsFor(runOpts),
+      runner: executeWorkflowGroupCellJob as EnqueueOptions['runner'],
+      cancelKey: cellCancelKey(runOpts.tableId, runOpts.rowId, runOpts.groupId),
+    },
+  }))
 }
 
-/**
- * Re-evaluate eligibility on every row of the table. Used after schema changes
- * (workflow group added, autoRun toggled on) where we don't have a list of
- * just-written rows but need to fire any newly-eligible (row × group) pair.
- */
-export async function scheduleRunsForTable(
-  table: TableDefinition,
-  opts?: ScheduleOpts
-): Promise<{ triggered: number }> {
-  const rows = await fetchAllRows(table.id)
-  return scheduleRunsForRows(table, rows, opts)
-}
-
-/**
- * Re-evaluate eligibility on the rows with these ids. Sugar for callers that
- * have row ids but not materialized rows.
- */
-async function scheduleRunsForRowIds(
-  table: TableDefinition,
-  rowIds: string[],
-  opts?: ScheduleOpts
-): Promise<{ triggered: number }> {
-  if (rowIds.length === 0) return { triggered: 0 }
-  const rows = await fetchRowsByIds(table.id, rowIds)
-  return scheduleRunsForRows(table, rows, opts)
+/** Stable key for `cancelInlineRun` lookups. Stamped on every enqueue item by
+ *  `buildEnqueueItems`; the cancel path computes the same key per cell. */
+export function cellCancelKey(tableId: string, rowId: string, groupId: string): string {
+  return `${tableId}:${rowId}:${groupId}`
 }
 
-async function fetchAllRows(tableId: string): Promise<TableRow[]> {
-  const records = await db.select().from(userTableRows).where(eq(userTableRows.tableId, tableId))
-  return records.map(toTableRow)
+/** Trigger.dev tags stamped on every `workflow-group-cell` run so tag-based
+ *  cancel (`runs.list({ tag })` + `runs.cancel(id)`) can target a specific
+ *  cell or table without needing per-cell jobIds. */
+export function cellTagsFor(runOpts: WorkflowGroupCellPayload): string[] {
+  return [`tableId:${runOpts.tableId}`, `rowId:${runOpts.rowId}`, `group:${runOpts.groupId}`]
 }
 
-async function fetchRowsByIds(tableId: string, rowIds: string[]): Promise<TableRow[]> {
-  const records = await db
-    .select()
-    .from(userTableRows)
-    .where(and(eq(userTableRows.tableId, tableId), inArray(userTableRows.id, rowIds)))
-  return records.map(toTableRow)
+/** Cancel every active trigger.dev `workflow-group-cell` run whose tags
+ *  match. Paginates `runs.list` and fires `runs.cancel` per match. Errors
+ *  are logged and swallowed — the cell-write SQL guard already makes
+ *  workers no-op on cancelled rows whether or not trigger.dev acked the
+ *  cancel, so partial failure is safe. */
+export async function cancelCellRunsByTags(tags: string[]): Promise<void> {
+  if (tags.length === 0) return
+  const { runs } = await import('@trigger.dev/sdk')
+  const cancellations: Array<Promise<unknown>> = []
+  try {
+    // Trigger.dev paginates with auto-iterating cursor — looping the page
+    // iterator is the documented usage pattern.
+    for await (const run of runs.list({
+      tag: tags,
+      taskIdentifier: 'workflow-group-cell',
+      status: ['PENDING_VERSION', 'QUEUED', 'DEQUEUED', 'EXECUTING', 'WAITING', 'DELAYED'],
+    })) {
+      cancellations.push(
+        runs.cancel(run.id).catch((err) => {
+          logger.warn(`cancelCellRunsByTags: cancel ${run.id} failed`, {
+            error: toError(err).message,
+          })
+        })
+      )
+    }
+    await Promise.allSettled(cancellations)
+  } catch (err) {
+    logger.warn(`cancelCellRunsByTags: list failed`, {
+      tags,
+      error: toError(err).message,
+    })
+  }
 }
 
-function toTableRow(r: typeof userTableRows.$inferSelect): TableRow {
+export function toTableRow(
+  r: typeof userTableRows.$inferSelect,
+  executions: RowExecutions = {}
+): TableRow {
   return {
     id: r.id,
     data: r.data as RowData,
-    executions: (r.executions as RowExecutions) ?? {},
+    executions,
     position: r.position,
     createdAt: r.createdAt,
     updatedAt: r.updatedAt,
   }
 }
 
-interface RunGroupCellOptions {
+export interface WorkflowGroupCellPayload {
   tableId: string
   tableName: string
   rowId: string
@@ -282,50 +303,25 @@ interface RunGroupCellOptions {
 }
 
 /** Per-table concurrency cap. Mirrors trigger.dev's `concurrencyLimit: 20`. */
-const TABLE_CONCURRENCY_LIMIT = 20
-
-async function stampQueuedOrCancel(
-  queue: Awaited<ReturnType<typeof getJobQueue>>,
-  opts: RunGroupCellOptions,
-  jobId: string
-): Promise<void> {
-  let stampResult: 'wrote' | 'skipped' = 'wrote'
-  try {
-    stampResult = await writeWorkflowGroupState(opts, {
-      executionState: {
-        status: 'queued',
-        executionId: opts.executionId,
-        jobId,
-        workflowId: opts.workflowId,
-        error: null,
-      },
-    })
-  } catch (err) {
-    logger.error(
-      `Failed to stamp queued state (table=${opts.tableId} row=${opts.rowId} group=${opts.groupId}):`,
-      err
-    )
-  }
-
-  if (stampResult === 'skipped') {
-    try {
-      await queue.cancelJob(jobId)
-    } catch (cancelErr) {
-      logger.error(`Failed to cancel orphaned workflow-group-cell job (jobId=${jobId}):`, cancelErr)
-    }
-  }
-}
+export const TABLE_CONCURRENCY_LIMIT = 20
 
 /**
  * Cancels in-flight workflow-group runs for a table or single row. Writes
  * `cancelled` authoritatively for every `running` or `pending` group
  * execution — the client-side write is the source of truth, independent of
  * whether the trigger.dev cancel reaches the worker before its terminal
- * write.
+ * write. Pass `groupIds` to restrict the cancel to a subset of groups on
+ * the row (used by `updateRow` to cancel only the downstream groups whose
+ * deps just changed).
  */
-export async function cancelWorkflowGroupRuns(tableId: string, rowId?: string): Promise<number> {
+export async function cancelWorkflowGroupRuns(
+  tableId: string,
+  rowId?: string,
+  options?: { groupIds?: string[] }
+): Promise<number> {
   const { getTableById, updateRow } = await import('@/lib/table/service')
   const { getJobQueue } = await import('@/lib/core/async-jobs/config')
+  const { listActiveDispatches, markActiveDispatchesCancelled } = await import('./dispatcher')
 
   const table = await getTableById(tableId)
   if (!table) {
@@ -333,22 +329,66 @@ export async function cancelWorkflowGroupRuns(tableId: string, rowId?: string):
     return 0
   }
 
-  const groups = table.schema.workflowGroups ?? []
-  if (groups.length === 0) return 0
-  const groupIds = new Set(groups.map((g) => g.id))
+  // Per-row cancel leaves the dispatcher alone — other rows in the same
+  // dispatch keep running. Table-wide cancel must stop it, else the cursor
+  // marches on and re-enqueues fresh cells past what we just cancelled.
+  if (!rowId) {
+    await markActiveDispatchesCancelled(tableId)
+  }
+
+  const allGroups = table.schema.workflowGroups ?? []
+  if (allGroups.length === 0) return 0
+  const groupIds = options?.groupIds
+    ? new Set(allGroups.filter((g) => options.groupIds?.includes(g.id)).map((g) => g.id))
+    : new Set(allGroups.map((g) => g.id))
+  if (groupIds.size === 0) return 0
+
+  // Per-row Stop on a row the dispatcher hasn't reached yet has no sidecar
+  // entry to cancel — the dispatcher would later walk to that row, see no
+  // exec, classify eligible, and re-fire. Pre-write `cancelled` tombstones
+  // for active-dispatch in-scope groups so the existing `cancelledAt >
+  // dispatch.requestedAt` filter in `dispatcherStep` catches them. Skip
+  // when there's no active dispatch (nothing to outrun).
+  let aheadOfCursorTombstones: Array<{ groupId: string; workflowId: string }> = []
+  if (rowId) {
+    const activeDispatches = await listActiveDispatches(tableId)
+    const relevant = activeDispatches.filter((d) => {
+      if (d.scope.rowIds && !d.scope.rowIds.includes(rowId)) return false
+      return d.scope.groupIds.some((gid) => groupIds.has(gid))
+    })
+    if (relevant.length > 0) {
+      // Intersection of targeted groups with active-dispatch scopes — only
+      // these groups are at risk of being re-fired by an in-progress dispatch.
+      const atRisk = new Set<string>()
+      for (const d of relevant) {
+        for (const gid of d.scope.groupIds) {
+          if (groupIds.has(gid)) atRisk.add(gid)
+        }
+      }
+      aheadOfCursorTombstones = Array.from(atRisk).map((gid) => ({
+        groupId: gid,
+        workflowId: allGroups.find((g) => g.id === gid)?.workflowId ?? '',
+      }))
+    }
+  }
 
   // Always filter by tableId — for the per-row case this prevents a
   // cross-table rowId from doing a wasted DB round-trip and silently
   // under-counting in the response. For the table-wide case it's the
   // primary filter.
-  const rows = await db
+  const inFlightStatuses = ['running', 'queued', 'pending']
+  const inFlightFilters = [
+    eq(tableRowExecutions.tableId, tableId),
+    inArray(tableRowExecutions.status, inFlightStatuses),
+    inArray(tableRowExecutions.groupId, Array.from(groupIds)),
+  ]
+  if (rowId) {
+    inFlightFilters.push(eq(tableRowExecutions.rowId, rowId))
+  }
+  const inFlightRows = await db
     .select()
-    .from(userTableRows)
-    .where(
-      rowId
-        ? and(eq(userTableRows.id, rowId), eq(userTableRows.tableId, tableId))
-        : eq(userTableRows.tableId, tableId)
-    )
+    .from(tableRowExecutions)
+    .where(and(...inFlightFilters))
 
   const queue = await getJobQueue()
 
@@ -358,45 +398,59 @@ export async function cancelWorkflowGroupRuns(tableId: string, rowId?: string):
     jobIds: string[]
     cancelledCount: number
   }
-  const mutations: RowMutation[] = []
-
-  for (const row of rows) {
-    const executions = (row.executions ?? {}) as RowExecutions
-    const executionsPatch: Record<string, RowExecutionMetadata> = {}
-    const jobIds: string[] = []
-    let cancelledCount = 0
-    for (const [gid, exec] of Object.entries(executions)) {
-      if (!groupIds.has(gid)) continue
-      // `pending` covers the post-reset, pre-dispatch window; `queued` covers
-      // the post-enqueue, pre-pickup window — a stop click in either state
-      // must still stick once the worker picks the row up.
-      if (exec.status !== 'running' && exec.status !== 'queued' && exec.status !== 'pending')
-        continue
-      if (exec.jobId) jobIds.push(exec.jobId)
-      executionsPatch[gid] = buildCancelledExecution(exec)
-      cancelledCount++
+  const byRow = new Map<string, RowMutation>()
+
+  for (const r of inFlightRows) {
+    const prev: RowExecutionMetadata = {
+      status: r.status as RowExecutionMetadata['status'],
+      executionId: r.executionId ?? null,
+      jobId: r.jobId ?? null,
+      workflowId: r.workflowId,
+      error: r.error ?? null,
+      ...(r.blockErrors && Object.keys(r.blockErrors as Record<string, string>).length > 0
+        ? { blockErrors: r.blockErrors as Record<string, string> }
+        : {}),
     }
-    if (cancelledCount > 0) {
-      mutations.push({ rowId: row.id, executionsPatch, jobIds, cancelledCount })
+    const existing = byRow.get(r.rowId) ?? {
+      rowId: r.rowId,
+      executionsPatch: {},
+      jobIds: [],
+      cancelledCount: 0,
     }
+    if (prev.jobId) existing.jobIds.push(prev.jobId)
+    existing.executionsPatch[r.groupId] = buildCancelledExecution(prev)
+    existing.cancelledCount++
+    byRow.set(r.rowId, existing)
   }
 
-  // Cancel jobs and write rows in parallel — no ordering dependency, so
-  // serializing dozens-to-hundreds of rows per stop click is pure latency.
-  await Promise.allSettled(
-    mutations.flatMap((m) =>
+  const mutations: RowMutation[] = Array.from(byRow.values())
+
+  // Abort in-flight cell runs. The interface method `cancelByKey` is a no-op
+  // on the trigger.dev backend (no in-process AbortControllers) and aborts
+  // the matching AbortController on the database backend. Trigger.dev's tag
+  // sweep covers the SaaS path; the cell-write SQL guard is the
+  // authoritative stop signal regardless of backend.
+  for (const m of mutations) {
+    for (const gid of Object.keys(m.executionsPatch)) {
+      queue.cancelByKey(cellCancelKey(tableId, m.rowId, gid))
+    }
+  }
+  const tagSweepPromise = isTriggerDevEnabled
+    ? cancelCellRunsByTags(rowId ? [`rowId:${rowId}`] : [`tableId:${tableId}`])
+    : Promise.resolve()
+  await Promise.allSettled([
+    ...mutations.flatMap((m) =>
       m.jobIds.map((jobId) =>
         queue.cancelJob(jobId).catch((err) => {
           logger.error(`Failed to cancel job ${jobId} for ${tableId}/${m.rowId}:`, err)
         })
       )
-    )
-  )
-  // `skipScheduler: true` — we're tearing rows down, not waking them up. The
-  // auto-fire reactor would otherwise see independent (row, group) pairs whose
-  // deps are now satisfied (because the upstream group already wrote its
-  // output before the cancel) and re-enqueue them, which is exactly what the
-  // user clicked Stop to prevent.
+    ),
+    tagSweepPromise,
+  ])
+  // `updateRow` no longer auto-fires the dispatcher post-write — the reactor
+  // was removed. Cancel-writes only touch executions[gid] state; no risk of
+  // re-enqueueing what we just cancelled.
   await Promise.allSettled(
     mutations.map((m) =>
       updateRow(
@@ -406,7 +460,6 @@ export async function cancelWorkflowGroupRuns(tableId: string, rowId?: string):
           data: {},
           workspaceId: table.workspaceId,
           executionsPatch: m.executionsPatch,
-          skipScheduler: true,
         },
         table,
         `wfgrp-cancel-${m.rowId}`
@@ -416,6 +469,45 @@ export async function cancelWorkflowGroupRuns(tableId: string, rowId?: string):
     )
   )
 
+  // Tombstones for ahead-of-cursor groups. The in-flight cancel writes above
+  // already cover groups that have a sidecar entry; we only need fresh
+  // tombstones for groups that don't (the dispatcher hasn't reached them
+  // yet, so there's nothing to cancel — but without a tombstone the
+  // dispatcher would still re-fire when its cursor walks to this row).
+  if (rowId && aheadOfCursorTombstones.length > 0) {
+    const alreadyHandled = new Set(mutations.flatMap((m) => Object.keys(m.executionsPatch)))
+    const needsTombstone = aheadOfCursorTombstones.filter((t) => !alreadyHandled.has(t.groupId))
+    if (needsTombstone.length > 0) {
+      const now = new Date()
+      await Promise.allSettled(
+        needsTombstone.map((t) =>
+          db
+            .insert(tableRowExecutions)
+            .values({
+              tableId,
+              rowId,
+              groupId: t.groupId,
+              status: 'cancelled',
+              executionId: null,
+              jobId: null,
+              workflowId: t.workflowId,
+              error: 'Cancelled',
+              runningBlockIds: [],
+              blockErrors: {},
+              cancelledAt: now,
+              updatedAt: now,
+            })
+            .onConflictDoNothing({
+              target: [tableRowExecutions.rowId, tableRowExecutions.groupId],
+            })
+            .catch((err) => {
+              logger.error(`Failed to write tombstone for ${tableId}/${rowId}/${t.groupId}:`, err)
+            })
+        )
+      )
+    }
+  }
+
   return mutations.reduce((sum, m) => sum + m.cancelledCount, 0)
 }
 
@@ -429,96 +521,122 @@ export async function cancelWorkflowGroupRuns(tableId: string, rowId?: string):
 export async function runWorkflowColumn(opts: {
   tableId: string
   workspaceId: string
-  mode: 'all' | 'incomplete'
+  mode: DispatchMode
   requestId: string
   groupIds?: string[]
   rowIds?: string[]
-}): Promise<{ triggered: number }> {
+  /** When false, eligibility honors `autoRun: false` and treats completed
+   *  cells as terminal — appropriate for auto-fire after row writes or
+   *  schema changes. Defaults to true (user-initiated "Run column"). */
+  isManualRun?: boolean
+}): Promise<{ dispatchId: string | null }> {
   const { tableId, workspaceId, mode, requestId, groupIds, rowIds } = opts
-  const { getTableById, batchUpdateRows } = await import('./service')
+  const isManualRun = opts.isManualRun ?? true
+  // Empty `rowIds` array means "scope explicitly empty" — auto-fire callers
+  // (CSV import on zero matches, etc.) end up here. Skip the dispatch entirely
+  // rather than walk the table with a no-match filter.
+  if (rowIds && rowIds.length === 0) return { dispatchId: null }
+  // Lazy imports: `./service` and `./dispatcher` both close cycles back to
+  // this module; `@trigger.dev/sdk` is heavy and only needed on this op.
+  const { getTableById } = await import('./service')
   const table = await getTableById(tableId)
   if (!table) throw new Error('Table not found')
   if (table.workspaceId !== workspaceId) throw new Error('Invalid workspace ID')
 
   const allGroups = table.schema.workflowGroups ?? []
   const targetGroups = groupIds ? allGroups.filter((g) => groupIds.includes(g.id)) : allGroups
-  if (targetGroups.length === 0) return { triggered: 0 }
-
-  logger.info(
-    `[Cascade] [${requestId}] manual run table=${tableId} groups=[${targetGroups.map((g) => g.id).join(',')}] rows=${rowIds ? `[${rowIds.join(',')}]` : 'all'} mode=${mode}`
+  // Tables with no workflow groups are the majority. Auto-fire callers from
+  // every row write would otherwise produce error-level log spam on every
+  // PATCH/insert. Manual run-column callers always pass `groupIds` so they
+  // can't reach here with an empty target.
+  if (targetGroups.length === 0) return { dispatchId: null }
+  const targetGroupIds = targetGroups.map((g) => g.id)
+
+  const { bulkClearWorkflowGroupCells, insertDispatch, runDispatcherToCompletion } = await import(
+    './dispatcher'
   )
 
-  const filters = [eq(userTableRows.tableId, tableId), eq(userTableRows.workspaceId, workspaceId)]
-  if (rowIds && rowIds.length > 0) {
-    filters.push(inArray(userTableRows.id, rowIds))
-  }
-  const candidateRows = await db
-    .select({
-      id: userTableRows.id,
-      position: userTableRows.position,
-      data: userTableRows.data,
-      executions: userTableRows.executions,
-      createdAt: userTableRows.createdAt,
-      updatedAt: userTableRows.updatedAt,
-    })
-    .from(userTableRows)
-    .where(and(...filters))
-    .orderBy(asc(userTableRows.position))
-
-  if (candidateRows.length === 0) return { triggered: 0 }
-
-  // Per-row: collect eligible groups, build cleared data + executionsPatch.
-  type Update = {
-    rowId: string
-    data: RowData
-    executionsPatch: Record<string, null>
-  }
-  const updates: Update[] = []
-  const clearedRows: TableRow[] = []
-  for (const r of candidateRows) {
-    const tableRow: TableRow = {
-      id: r.id,
-      data: r.data as RowData,
-      executions: (r.executions as RowExecutions) ?? {},
-      position: r.position,
-      createdAt: r.createdAt,
-      updatedAt: r.updatedAt,
-    }
-    const eligibleGroups = targetGroups.filter((g) =>
-      isGroupEligible(g, tableRow, { isManualRun: true, mode })
-    )
-    if (eligibleGroups.length === 0) continue
-
-    const clearedData: RowData = {}
-    const executionsPatch: Record<string, null> = {}
-    for (const g of eligibleGroups) {
-      for (const o of g.outputs) clearedData[o.columnName] = null
-      executionsPatch[g.id] = null
+  // For manual runs (Run all rows / Run column / Refresh-row / Refresh-cell),
+  // cancel any prior active dispatches AND in-flight cells in scope before
+  // clearing. Without this:
+  //  - Two dispatcher loops would walk overlapping rows and burn duplicate work.
+  //  - mode:'all' bulk-clear deletes in-flight sidecar rows without aborting
+  //    workers — those would keep writing into the wiped state.
+  // Scope: table-wide cancel when rowIds is empty (also cancels active
+  // dispatches via markActiveDispatchesCancelled), per-row cancel otherwise
+  // (no dispatch cancel — other rows' dispatches keep running). Dep-edit
+  // cascade in `updateRow` already cancels its own scope before calling,
+  // so the duplicate work here is a cheap no-op for that caller.
+  // Auto-fire (`mode:'new'`) is harmless overlap-wise — the NOT EXISTS
+  // filter excludes already-attempted rows.
+  const cancelPriorRuns = isManualRun && (mode === 'all' || mode === 'incomplete')
+  if (cancelPriorRuns) {
+    if (!rowIds || rowIds.length === 0) {
+      await cancelWorkflowGroupRuns(tableId, undefined, { groupIds: targetGroupIds })
+    } else {
+      // Per-row cancel — sequential so we don't fan out N parallel
+      // markActiveDispatchesCancelled calls (it's a no-op when rowId is set,
+      // but each call still touches the DB).
+      for (const rowId of rowIds) {
+        await cancelWorkflowGroupRuns(tableId, rowId, { groupIds: targetGroupIds })
+      }
     }
-    updates.push({ rowId: r.id, data: clearedData, executionsPatch })
-
-    const remainingExec = { ...tableRow.executions }
-    for (const g of eligibleGroups) delete remainingExec[g.id]
-    clearedRows.push({
-      ...tableRow,
-      data: { ...tableRow.data, ...clearedData },
-      executions: remainingExec,
-    })
   }
 
-  if (updates.length === 0) return { triggered: 0 }
-
-  // `skipScheduler: true` because we fire `scheduleRunsForRows` ourselves
-  // below with `isManualRun: true`. Without the skip, batchUpdateRows runs the
-  // auto-fire reactor first and any autoRun=true sibling group whose deps are
-  // satisfied would race the manual call.
-  await batchUpdateRows({ tableId, updates, workspaceId, skipScheduler: true }, table, requestId)
+  // Wipe targeted output cols + executions[gid] before any cells fire so the
+  // user sees the column flip to empty/Pending instantly.
+  await bulkClearWorkflowGroupCells({
+    tableId,
+    groups: targetGroups.map((g) => ({ id: g.id, outputs: g.outputs })),
+    rowIds,
+    mode,
+  })
 
-  return scheduleRunsForRows(table, clearedRows, {
-    isManualRun: true,
-    groupIds: targetGroups.map((g) => g.id),
+  // Always insert a `table_run_dispatches` row. The dispatcher state machine
+  // is the single source of truth for cursor advancement, SSE emission, and
+  // cancel — backend (trigger.dev SaaS vs in-process) only affects how each
+  // window's cells get executed.
+  const dispatchId = await insertDispatch({
+    tableId,
+    workspaceId,
+    requestId,
     mode,
+    scope: {
+      groupIds: targetGroupIds,
+      ...(rowIds && rowIds.length > 0 ? { rowIds } : {}),
+    },
+    isManualRun,
   })
+
+  logger.info(
+    `[Cascade] [${requestId}] dispatch ${dispatchId} table=${tableId} groups=[${targetGroupIds.join(',')}] rows=${rowIds ? `[${rowIds.join(',')}]` : 'all'} mode=${mode}`
+  )
+
+  if (isTriggerDevEnabled) {
+    // Trigger.dev runs `tableRunDispatcherTask`, which loops `dispatcherStep`
+    // until done with CRIU-checkpointed waits between windows.
+    const [{ tableRunDispatcherTask }, { tasks }] = await Promise.all([
+      import('@/background/table-run-dispatcher'),
+      import('@trigger.dev/sdk'),
+    ])
+    await tasks.trigger<typeof tableRunDispatcherTask>(
+      'table-run-dispatcher',
+      { dispatchId },
+      { concurrencyKey: dispatchId }
+    )
+  } else {
+    // Local / no-trigger.dev: drive the same loop in-process, fire-and-forget
+    // so the HTTP request returns instantly (mirrors the trigger.dev path's
+    // async fan-out).
+    void runDispatcherToCompletion(dispatchId).catch((err) =>
+      logger.error(`[${requestId}] dispatcher loop failed`, {
+        dispatchId,
+        error: toError(err).message,
+      })
+    )
+  }
+
+  return { dispatchId }
 }
 
 // ───────────────────────────── Validation ─────────────────────────────
diff --git a/packages/db/migrations/0209_smiling_fixer.sql b/packages/db/migrations/0209_smiling_fixer.sql
new file mode 100644
index 00000000000..109523397fb
--- /dev/null
+++ b/packages/db/migrations/0209_smiling_fixer.sql
@@ -0,0 +1,41 @@
+CREATE TABLE "table_row_executions" (
+	"table_id" text NOT NULL,
+	"row_id" text NOT NULL,
+	"group_id" text NOT NULL,
+	"status" text NOT NULL,
+	"execution_id" text,
+	"job_id" text,
+	"workflow_id" text NOT NULL,
+	"error" text,
+	"running_block_ids" text[] DEFAULT '{}'::text[] NOT NULL,
+	"block_errors" jsonb DEFAULT '{}'::jsonb NOT NULL,
+	"cancelled_at" timestamp,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "table_row_executions_row_id_group_id_pk" PRIMARY KEY("row_id","group_id")
+);
+--> statement-breakpoint
+CREATE TABLE "table_run_dispatches" (
+	"id" text PRIMARY KEY NOT NULL,
+	"table_id" text NOT NULL,
+	"workspace_id" text NOT NULL,
+	"request_id" text NOT NULL,
+	"mode" text NOT NULL,
+	"scope" jsonb NOT NULL,
+	"status" text DEFAULT 'pending' NOT NULL,
+	"cursor" integer DEFAULT 0 NOT NULL,
+	"is_manual_run" boolean DEFAULT true NOT NULL,
+	"requested_at" timestamp DEFAULT now() NOT NULL,
+	"completed_at" timestamp,
+	"cancelled_at" timestamp
+);
+--> statement-breakpoint
+ALTER TABLE "table_row_executions" ADD CONSTRAINT "table_row_executions_table_id_user_table_definitions_id_fk" FOREIGN KEY ("table_id") REFERENCES "public"."user_table_definitions"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "table_row_executions" ADD CONSTRAINT "table_row_executions_row_id_user_table_rows_id_fk" FOREIGN KEY ("row_id") REFERENCES "public"."user_table_rows"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "table_run_dispatches" ADD CONSTRAINT "table_run_dispatches_table_id_user_table_definitions_id_fk" FOREIGN KEY ("table_id") REFERENCES "public"."user_table_definitions"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "table_run_dispatches" ADD CONSTRAINT "table_run_dispatches_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "table_row_executions_table_status_idx" ON "table_row_executions" USING btree ("table_id","status") WHERE "table_row_executions"."status" IN ('queued', 'running', 'pending');--> statement-breakpoint
+CREATE INDEX "table_row_executions_execution_id_idx" ON "table_row_executions" USING btree ("execution_id") WHERE "table_row_executions"."execution_id" IS NOT NULL;--> statement-breakpoint
+CREATE INDEX "table_row_executions_table_group_idx" ON "table_row_executions" USING btree ("table_id","group_id");--> statement-breakpoint
+CREATE INDEX "table_run_dispatches_active_idx" ON "table_run_dispatches" USING btree ("table_id","status");--> statement-breakpoint
+CREATE INDEX "table_run_dispatches_watchdog_idx" ON "table_run_dispatches" USING btree ("status","requested_at");--> statement-breakpoint
+ALTER TABLE "user_table_rows" DROP COLUMN "executions";
\ No newline at end of file
diff --git a/packages/db/migrations/meta/0209_snapshot.json b/packages/db/migrations/meta/0209_snapshot.json
new file mode 100644
index 00000000000..378fabd1b3a
--- /dev/null
+++ b/packages/db/migrations/meta/0209_snapshot.json
@@ -0,0 +1,16431 @@
+{
+  "id": "77be6741-7a6f-4e72-8be1-54fa58eee8e3",
+  "prevId": "67dde2dd-485d-4e3d-b2a5-a3caae8b26ae",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.a2a_agent": {
+      "name": "a2a_agent",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'1.0.0'"
+        },
+        "capabilities": {
+          "name": "capabilities",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "skills": {
+          "name": "skills",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "authentication": {
+          "name": "authentication",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "signatures": {
+          "name": "signatures",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "is_published": {
+          "name": "is_published",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "published_at": {
+          "name": "published_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "a2a_agent_workflow_id_idx": {
+          "name": "a2a_agent_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_created_by_idx": {
+          "name": "a2a_agent_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_workspace_workflow_unique": {
+          "name": "a2a_agent_workspace_workflow_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"a2a_agent\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_archived_at_idx": {
+          "name": "a2a_agent_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_workspace_archived_partial_idx": {
+          "name": "a2a_agent_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"a2a_agent\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_agent_workspace_id_workspace_id_fk": {
+          "name": "a2a_agent_workspace_id_workspace_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "a2a_agent_workflow_id_workflow_id_fk": {
+          "name": "a2a_agent_workflow_id_workflow_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "a2a_agent_created_by_user_id_fk": {
+          "name": "a2a_agent_created_by_user_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.a2a_push_notification_config": {
+      "name": "a2a_push_notification_config",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "auth_schemes": {
+          "name": "auth_schemes",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "auth_credentials": {
+          "name": "auth_credentials",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "a2a_push_notification_config_task_unique": {
+          "name": "a2a_push_notification_config_task_unique",
+          "columns": [
+            {
+              "expression": "task_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_push_notification_config_task_id_a2a_task_id_fk": {
+          "name": "a2a_push_notification_config_task_id_a2a_task_id_fk",
+          "tableFrom": "a2a_push_notification_config",
+          "tableTo": "a2a_task",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.a2a_task": {
+      "name": "a2a_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "agent_id": {
+          "name": "agent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "a2a_task_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'submitted'"
+        },
+        "messages": {
+          "name": "messages",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "artifacts": {
+          "name": "artifacts",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "a2a_task_agent_id_idx": {
+          "name": "a2a_task_agent_id_idx",
+          "columns": [
+            {
+              "expression": "agent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_session_id_idx": {
+          "name": "a2a_task_session_id_idx",
+          "columns": [
+            {
+              "expression": "session_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_status_idx": {
+          "name": "a2a_task_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_execution_id_idx": {
+          "name": "a2a_task_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_created_at_idx": {
+          "name": "a2a_task_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_task_agent_id_a2a_agent_id_fk": {
+          "name": "a2a_task_agent_id_a2a_agent_id_fk",
+          "tableFrom": "a2a_task",
+          "tableTo": "a2a_agent",
+          "columnsFrom": ["agent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.academy_certificate": {
+      "name": "academy_certificate",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "academy_cert_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "issued_at": {
+          "name": "issued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "certificate_number": {
+          "name": "certificate_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "academy_certificate_user_id_idx": {
+          "name": "academy_certificate_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_course_id_idx": {
+          "name": "academy_certificate_course_id_idx",
+          "columns": [
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_user_course_unique": {
+          "name": "academy_certificate_user_course_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_number_idx": {
+          "name": "academy_certificate_number_idx",
+          "columns": [
+            {
+              "expression": "certificate_number",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_status_idx": {
+          "name": "academy_certificate_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "academy_certificate_user_id_user_id_fk": {
+          "name": "academy_certificate_user_id_user_id_fk",
+          "tableFrom": "academy_certificate",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "academy_certificate_certificate_number_unique": {
+          "name": "academy_certificate_certificate_number_unique",
+          "nullsNotDistinct": false,
+          "columns": ["certificate_number"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "account_user_id_idx": {
+          "name": "account_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_account_on_account_id_provider_id": {
+          "name": "idx_account_on_account_id_provider_id",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "account_user_id_user_id_fk": {
+          "name": "account_user_id_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_key": {
+      "name": "api_key",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key_hash": {
+          "name": "key_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'personal'"
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "api_key_workspace_type_idx": {
+          "name": "api_key_workspace_type_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "api_key_user_type_idx": {
+          "name": "api_key_user_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "api_key_key_hash_idx": {
+          "name": "api_key_key_hash_idx",
+          "columns": [
+            {
+              "expression": "key_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "api_key_user_id_user_id_fk": {
+          "name": "api_key_user_id_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_workspace_id_workspace_id_fk": {
+          "name": "api_key_workspace_id_workspace_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_created_by_user_id_fk": {
+          "name": "api_key_created_by_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_key_key_unique": {
+          "name": "api_key_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {
+        "workspace_type_check": {
+          "name": "workspace_type_check",
+          "value": "(type = 'workspace' AND workspace_id IS NOT NULL) OR (type = 'personal' AND workspace_id IS NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.async_jobs": {
+      "name": "async_jobs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_at": {
+          "name": "run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 3
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "output": {
+          "name": "output",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "async_jobs_status_started_at_idx": {
+          "name": "async_jobs_status_started_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "async_jobs_status_completed_at_idx": {
+          "name": "async_jobs_status_completed_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.audit_log": {
+      "name": "audit_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_id": {
+          "name": "actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_type": {
+          "name": "resource_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_id": {
+          "name": "resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_name": {
+          "name": "actor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_email": {
+          "name": "actor_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resource_name": {
+          "name": "resource_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "audit_log_workspace_created_idx": {
+          "name": "audit_log_workspace_created_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_workspace_created_at_id_idx": {
+          "name": "audit_log_workspace_created_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"created_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_actor_created_idx": {
+          "name": "audit_log_actor_created_idx",
+          "columns": [
+            {
+              "expression": "actor_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_resource_idx": {
+          "name": "audit_log_resource_idx",
+          "columns": [
+            {
+              "expression": "resource_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_action_idx": {
+          "name": "audit_log_action_idx",
+          "columns": [
+            {
+              "expression": "action",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "audit_log_workspace_id_workspace_id_fk": {
+          "name": "audit_log_workspace_id_workspace_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "audit_log_actor_id_user_id_fk": {
+          "name": "audit_log_actor_id_user_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "user",
+          "columnsFrom": ["actor_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chat": {
+      "name": "chat",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "output_configs": {
+          "name": "output_configs",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "identifier_idx": {
+          "name": "identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"chat\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "chat_archived_at_partial_idx": {
+          "name": "chat_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"chat\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "chat_workflow_id_workflow_id_fk": {
+          "name": "chat_workflow_id_workflow_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "chat_user_id_user_id_fk": {
+          "name": "chat_user_id_user_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_async_tool_calls": {
+      "name": "copilot_async_tool_calls",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "checkpoint_id": {
+          "name": "checkpoint_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tool_call_id": {
+          "name": "tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "args": {
+          "name": "args",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_async_tool_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "result": {
+          "name": "result",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_async_tool_calls_run_id_idx": {
+          "name": "copilot_async_tool_calls_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_checkpoint_id_idx": {
+          "name": "copilot_async_tool_calls_checkpoint_id_idx",
+          "columns": [
+            {
+              "expression": "checkpoint_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_idx": {
+          "name": "copilot_async_tool_calls_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_status_idx": {
+          "name": "copilot_async_tool_calls_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_run_status_idx": {
+          "name": "copilot_async_tool_calls_run_status_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_unique": {
+          "name": "copilot_async_tool_calls_tool_call_id_unique",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_async_tool_calls_run_id_copilot_runs_id_fk": {
+          "name": "copilot_async_tool_calls_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk": {
+          "name": "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_run_checkpoints",
+          "columnsFrom": ["checkpoint_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_chats": {
+      "name": "copilot_chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "chat_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'copilot'"
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "messages": {
+          "name": "messages",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'claude-3-7-sonnet-latest'"
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "preview_yaml": {
+          "name": "preview_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan_artifact": {
+          "name": "plan_artifact",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resources": {
+          "name": "resources",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pinned": {
+          "name": "pinned",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_chats_user_id_idx": {
+          "name": "copilot_chats_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_workflow_id_idx": {
+          "name": "copilot_chats_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workflow_idx": {
+          "name": "copilot_chats_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workspace_idx": {
+          "name": "copilot_chats_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_created_at_idx": {
+          "name": "copilot_chats_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_updated_at_idx": {
+          "name": "copilot_chats_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_workspace_created_at_id_idx": {
+          "name": "copilot_chats_workspace_created_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"created_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_chats_user_id_user_id_fk": {
+          "name": "copilot_chats_user_id_user_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workflow_id_workflow_id_fk": {
+          "name": "copilot_chats_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workspace_id_workspace_id_fk": {
+          "name": "copilot_chats_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_feedback": {
+      "name": "copilot_feedback",
+      "schema": "",
+      "columns": {
+        "feedback_id": {
+          "name": "feedback_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_query": {
+          "name": "user_query",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent_response": {
+          "name": "agent_response",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_positive": {
+          "name": "is_positive",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "feedback": {
+          "name": "feedback",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_yaml": {
+          "name": "workflow_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_feedback_user_id_idx": {
+          "name": "copilot_feedback_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_chat_id_idx": {
+          "name": "copilot_feedback_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_user_chat_idx": {
+          "name": "copilot_feedback_user_chat_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_is_positive_idx": {
+          "name": "copilot_feedback_is_positive_idx",
+          "columns": [
+            {
+              "expression": "is_positive",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_created_at_idx": {
+          "name": "copilot_feedback_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_feedback_user_id_user_id_fk": {
+          "name": "copilot_feedback_user_id_user_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_feedback_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_feedback_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_run_checkpoints": {
+      "name": "copilot_run_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pending_tool_call_id": {
+          "name": "pending_tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "conversation_snapshot": {
+          "name": "conversation_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "agent_state": {
+          "name": "agent_state",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "provider_request": {
+          "name": "provider_request",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_run_checkpoints_run_id_idx": {
+          "name": "copilot_run_checkpoints_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_pending_tool_call_id_idx": {
+          "name": "copilot_run_checkpoints_pending_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_run_pending_tool_unique": {
+          "name": "copilot_run_checkpoints_run_pending_tool_unique",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_run_checkpoints_run_id_copilot_runs_id_fk": {
+          "name": "copilot_run_checkpoints_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_run_checkpoints",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_runs": {
+      "name": "copilot_runs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_run_id": {
+          "name": "parent_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stream_id": {
+          "name": "stream_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent": {
+          "name": "agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_run_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "request_context": {
+          "name": "request_context",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "copilot_runs_execution_id_idx": {
+          "name": "copilot_runs_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_parent_run_id_idx": {
+          "name": "copilot_runs_parent_run_id_idx",
+          "columns": [
+            {
+              "expression": "parent_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_id_idx": {
+          "name": "copilot_runs_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_user_id_idx": {
+          "name": "copilot_runs_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workflow_id_idx": {
+          "name": "copilot_runs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workspace_id_idx": {
+          "name": "copilot_runs_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_status_idx": {
+          "name": "copilot_runs_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_execution_idx": {
+          "name": "copilot_runs_chat_execution_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_execution_started_at_idx": {
+          "name": "copilot_runs_execution_started_at_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workspace_completed_at_id_idx": {
+          "name": "copilot_runs_workspace_completed_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"completed_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_stream_id_unique": {
+          "name": "copilot_runs_stream_id_unique",
+          "columns": [
+            {
+              "expression": "stream_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_runs_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_runs_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_user_id_user_id_fk": {
+          "name": "copilot_runs_user_id_user_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workflow_id_workflow_id_fk": {
+          "name": "copilot_runs_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workspace_id_workspace_id_fk": {
+          "name": "copilot_runs_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_workflow_read_hashes": {
+      "name": "copilot_workflow_read_hashes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_workflow_read_hashes_chat_id_idx": {
+          "name": "copilot_workflow_read_hashes_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_workflow_id_idx": {
+          "name": "copilot_workflow_read_hashes_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_chat_workflow_unique": {
+          "name": "copilot_workflow_read_hashes_chat_workflow_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_workflow_read_hashes_workflow_id_workflow_id_fk": {
+          "name": "copilot_workflow_read_hashes_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential": {
+      "name": "credential",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "credential_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_key": {
+          "name": "env_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_owner_user_id": {
+          "name": "env_owner_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_service_account_key": {
+          "name": "encrypted_service_account_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_workspace_id_idx": {
+          "name": "credential_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_type_idx": {
+          "name": "credential_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_provider_id_idx": {
+          "name": "credential_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_account_id_idx": {
+          "name": "credential_account_id_idx",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_env_owner_user_id_idx": {
+          "name": "credential_env_owner_user_id_idx",
+          "columns": [
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_account_unique": {
+          "name": "credential_workspace_account_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "account_id IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_env_unique": {
+          "name": "credential_workspace_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_workspace'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_personal_env_unique": {
+          "name": "credential_workspace_personal_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_personal'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_workspace_id_workspace_id_fk": {
+          "name": "credential_workspace_id_workspace_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_account_id_account_id_fk": {
+          "name": "credential_account_id_account_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "account",
+          "columnsFrom": ["account_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_env_owner_user_id_user_id_fk": {
+          "name": "credential_env_owner_user_id_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["env_owner_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_created_by_user_id_fk": {
+          "name": "credential_created_by_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "credential_oauth_source_check": {
+          "name": "credential_oauth_source_check",
+          "value": "(type <> 'oauth') OR (account_id IS NOT NULL AND provider_id IS NOT NULL)"
+        },
+        "credential_workspace_env_source_check": {
+          "name": "credential_workspace_env_source_check",
+          "value": "(type <> 'env_workspace') OR (env_key IS NOT NULL AND env_owner_user_id IS NULL)"
+        },
+        "credential_personal_env_source_check": {
+          "name": "credential_personal_env_source_check",
+          "value": "(type <> 'env_personal') OR (env_key IS NOT NULL AND env_owner_user_id IS NOT NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.credential_member": {
+      "name": "credential_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "credential_member_role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_member_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_member_user_id_idx": {
+          "name": "credential_member_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_role_idx": {
+          "name": "credential_member_role_idx",
+          "columns": [
+            {
+              "expression": "role",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_status_idx": {
+          "name": "credential_member_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_unique": {
+          "name": "credential_member_unique",
+          "columns": [
+            {
+              "expression": "credential_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_member_credential_id_credential_id_fk": {
+          "name": "credential_member_credential_id_credential_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_user_id_user_id_fk": {
+          "name": "credential_member_user_id_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_invited_by_user_id_fk": {
+          "name": "credential_member_invited_by_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set": {
+      "name": "credential_set",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_created_by_idx": {
+          "name": "credential_set_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_org_name_unique": {
+          "name": "credential_set_org_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_provider_id_idx": {
+          "name": "credential_set_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_organization_id_organization_id_fk": {
+          "name": "credential_set_organization_id_organization_id_fk",
+          "tableFrom": "credential_set",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_created_by_user_id_fk": {
+          "name": "credential_set_created_by_user_id_fk",
+          "tableFrom": "credential_set",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set_invitation": {
+      "name": "credential_set_invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_set_invitation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "accepted_at": {
+          "name": "accepted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "accepted_by_user_id": {
+          "name": "accepted_by_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_invitation_set_id_idx": {
+          "name": "credential_set_invitation_set_id_idx",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_token_idx": {
+          "name": "credential_set_invitation_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_status_idx": {
+          "name": "credential_set_invitation_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_expires_at_idx": {
+          "name": "credential_set_invitation_expires_at_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_invitation_credential_set_id_credential_set_id_fk": {
+          "name": "credential_set_invitation_credential_set_id_credential_set_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_invitation_invited_by_user_id_fk": {
+          "name": "credential_set_invitation_invited_by_user_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_invitation_accepted_by_user_id_user_id_fk": {
+          "name": "credential_set_invitation_accepted_by_user_id_user_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["accepted_by_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "credential_set_invitation_token_unique": {
+          "name": "credential_set_invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set_member": {
+      "name": "credential_set_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_set_member_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_member_user_id_idx": {
+          "name": "credential_set_member_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_member_unique": {
+          "name": "credential_set_member_unique",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_member_status_idx": {
+          "name": "credential_set_member_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_member_credential_set_id_credential_set_id_fk": {
+          "name": "credential_set_member_credential_set_id_credential_set_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_member_user_id_user_id_fk": {
+          "name": "credential_set_member_user_id_user_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_member_invited_by_user_id_fk": {
+          "name": "credential_set_member_invited_by_user_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.custom_tools": {
+      "name": "custom_tools",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schema": {
+          "name": "schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "custom_tools_workspace_id_idx": {
+          "name": "custom_tools_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "custom_tools_workspace_title_unique": {
+          "name": "custom_tools_workspace_title_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "title",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "custom_tools_workspace_id_workspace_id_fk": {
+          "name": "custom_tools_workspace_id_workspace_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "custom_tools_user_id_user_id_fk": {
+          "name": "custom_tools_user_id_user_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.data_drain_runs": {
+      "name": "data_drain_runs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "drain_id": {
+          "name": "drain_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "data_drain_run_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "data_drain_run_trigger",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "finished_at": {
+          "name": "finished_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rows_exported": {
+          "name": "rows_exported",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "bytes_written": {
+          "name": "bytes_written",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "cursor_before": {
+          "name": "cursor_before",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cursor_after": {
+          "name": "cursor_after",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "locators": {
+          "name": "locators",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        }
+      },
+      "indexes": {
+        "data_drain_runs_drain_started_idx": {
+          "name": "data_drain_runs_drain_started_idx",
+          "columns": [
+            {
+              "expression": "drain_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "data_drain_runs_drain_id_data_drains_id_fk": {
+          "name": "data_drain_runs_drain_id_data_drains_id_fk",
+          "tableFrom": "data_drain_runs",
+          "tableTo": "data_drains",
+          "columnsFrom": ["drain_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.data_drains": {
+      "name": "data_drains",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "data_drain_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_type": {
+          "name": "destination_type",
+          "type": "data_drain_destination",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_config": {
+          "name": "destination_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_credentials": {
+          "name": "destination_credentials",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schedule_cadence": {
+          "name": "schedule_cadence",
+          "type": "data_drain_cadence",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "cursor": {
+          "name": "cursor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_success_at": {
+          "name": "last_success_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "data_drains_org_idx": {
+          "name": "data_drains_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "data_drains_due_idx": {
+          "name": "data_drains_due_idx",
+          "columns": [
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "last_run_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "data_drains_org_name_unique": {
+          "name": "data_drains_org_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "data_drains_organization_id_organization_id_fk": {
+          "name": "data_drains_organization_id_organization_id_fk",
+          "tableFrom": "data_drains",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "data_drains_created_by_user_id_fk": {
+          "name": "data_drains_created_by_user_id_fk",
+          "tableFrom": "data_drains",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.docs_embeddings": {
+      "name": "docs_embeddings",
+      "schema": "",
+      "columns": {
+        "chunk_id": {
+          "name": "chunk_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chunk_text": {
+          "name": "chunk_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_document": {
+          "name": "source_document",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_link": {
+          "name": "source_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_text": {
+          "name": "header_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_level": {
+          "name": "header_level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "chunk_text_tsv": {
+          "name": "chunk_text_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"docs_embeddings\".\"chunk_text\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "docs_emb_source_document_idx": {
+          "name": "docs_emb_source_document_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_header_level_idx": {
+          "name": "docs_emb_header_level_idx",
+          "columns": [
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_source_header_idx": {
+          "name": "docs_emb_source_header_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_model_idx": {
+          "name": "docs_emb_model_idx",
+          "columns": [
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_created_at_idx": {
+          "name": "docs_emb_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_embedding_vector_hnsw_idx": {
+          "name": "docs_embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "docs_emb_metadata_gin_idx": {
+          "name": "docs_emb_metadata_gin_idx",
+          "columns": [
+            {
+              "expression": "metadata",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "docs_emb_chunk_text_fts_idx": {
+          "name": "docs_emb_chunk_text_fts_idx",
+          "columns": [
+            {
+              "expression": "chunk_text_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "docs_embedding_not_null_check": {
+          "name": "docs_embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        },
+        "docs_header_level_check": {
+          "name": "docs_header_level_check",
+          "value": "\"header_level\" >= 1 AND \"header_level\" <= 6"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.document": {
+      "name": "document",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_url": {
+          "name": "file_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_size": {
+          "name": "file_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mime_type": {
+          "name": "mime_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_count": {
+          "name": "chunk_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "character_count": {
+          "name": "character_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "processing_status": {
+          "name": "processing_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_completed_at": {
+          "name": "processing_completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_error": {
+          "name": "processing_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_excluded": {
+          "name": "user_excluded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_url": {
+          "name": "source_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "doc_kb_id_idx": {
+          "name": "doc_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_filename_idx": {
+          "name": "doc_filename_idx",
+          "columns": [
+            {
+              "expression": "filename",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_processing_status_idx": {
+          "name": "doc_processing_status_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "processing_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_external_id_idx": {
+          "name": "doc_connector_external_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "external_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"document\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_id_idx": {
+          "name": "doc_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_archived_at_partial_idx": {
+          "name": "doc_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"document\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_deleted_at_partial_idx": {
+          "name": "doc_deleted_at_partial_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"document\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag1_idx": {
+          "name": "doc_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag2_idx": {
+          "name": "doc_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag3_idx": {
+          "name": "doc_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag4_idx": {
+          "name": "doc_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag5_idx": {
+          "name": "doc_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag6_idx": {
+          "name": "doc_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag7_idx": {
+          "name": "doc_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number1_idx": {
+          "name": "doc_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number2_idx": {
+          "name": "doc_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number3_idx": {
+          "name": "doc_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number4_idx": {
+          "name": "doc_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number5_idx": {
+          "name": "doc_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date1_idx": {
+          "name": "doc_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date2_idx": {
+          "name": "doc_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean1_idx": {
+          "name": "doc_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean2_idx": {
+          "name": "doc_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean3_idx": {
+          "name": "doc_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "document_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "document_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "document_connector_id_knowledge_connector_id_fk": {
+          "name": "document_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.embedding": {
+      "name": "embedding",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_id": {
+          "name": "document_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_index": {
+          "name": "chunk_index",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_hash": {
+          "name": "chunk_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content_length": {
+          "name": "content_length",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "start_offset": {
+          "name": "start_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "end_offset": {
+          "name": "end_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "content_tsv": {
+          "name": "content_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"embedding\".\"content\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "emb_kb_id_idx": {
+          "name": "emb_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_id_idx": {
+          "name": "emb_doc_id_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_chunk_idx": {
+          "name": "emb_doc_chunk_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chunk_index",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_model_idx": {
+          "name": "emb_kb_model_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_enabled_idx": {
+          "name": "emb_kb_enabled_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_enabled_idx": {
+          "name": "emb_doc_enabled_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "embedding_vector_hnsw_idx": {
+          "name": "embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "emb_tag1_idx": {
+          "name": "emb_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag2_idx": {
+          "name": "emb_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag3_idx": {
+          "name": "emb_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag4_idx": {
+          "name": "emb_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag5_idx": {
+          "name": "emb_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag6_idx": {
+          "name": "emb_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag7_idx": {
+          "name": "emb_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number1_idx": {
+          "name": "emb_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number2_idx": {
+          "name": "emb_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number3_idx": {
+          "name": "emb_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number4_idx": {
+          "name": "emb_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number5_idx": {
+          "name": "emb_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date1_idx": {
+          "name": "emb_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date2_idx": {
+          "name": "emb_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean1_idx": {
+          "name": "emb_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean2_idx": {
+          "name": "emb_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean3_idx": {
+          "name": "emb_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_content_fts_idx": {
+          "name": "emb_content_fts_idx",
+          "columns": [
+            {
+              "expression": "content_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "embedding_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "embedding_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "embedding_document_id_document_id_fk": {
+          "name": "embedding_document_id_document_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "document",
+          "columnsFrom": ["document_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "embedding_not_null_check": {
+          "name": "embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.environment": {
+      "name": "environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_user_id_user_id_fk": {
+          "name": "environment_user_id_user_id_fk",
+          "tableFrom": "environment",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "environment_user_id_unique": {
+          "name": "environment_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.form": {
+      "name": "form",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "show_branding": {
+          "name": "show_branding",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "form_identifier_idx": {
+          "name": "form_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"form\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_workflow_id_idx": {
+          "name": "form_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_user_id_idx": {
+          "name": "form_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_archived_at_partial_idx": {
+          "name": "form_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"form\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "form_workflow_id_workflow_id_fk": {
+          "name": "form_workflow_id_workflow_id_fk",
+          "tableFrom": "form",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "form_user_id_user_id_fk": {
+          "name": "form_user_id_user_id_fk",
+          "tableFrom": "form",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.idempotency_key": {
+      "name": "idempotency_key",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "result": {
+          "name": "result",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idempotency_key_created_at_idx": {
+          "name": "idempotency_key_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation": {
+      "name": "invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "kind": {
+          "name": "kind",
+          "type": "invitation_kind",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'organization'"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "membership_intent": {
+          "name": "membership_intent",
+          "type": "invitation_membership_intent",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'internal'"
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "invitation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "invitation_email_idx": {
+          "name": "invitation_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_organization_id_idx": {
+          "name": "invitation_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_status_idx": {
+          "name": "invitation_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_pending_email_org_unique": {
+          "name": "invitation_pending_email_org_unique",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"invitation\".\"status\" = 'pending' AND \"invitation\".\"organization_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_inviter_id_user_id_fk": {
+          "name": "invitation_inviter_id_user_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "user",
+          "columnsFrom": ["inviter_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_organization_id_organization_id_fk": {
+          "name": "invitation_organization_id_organization_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "invitation_token_unique": {
+          "name": "invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation_workspace_grant": {
+      "name": "invitation_workspace_grant",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "invitation_id": {
+          "name": "invitation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission": {
+          "name": "permission",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "invitation_workspace_grant_unique": {
+          "name": "invitation_workspace_grant_unique",
+          "columns": [
+            {
+              "expression": "invitation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_workspace_grant_workspace_id_idx": {
+          "name": "invitation_workspace_grant_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_workspace_grant_invitation_id_invitation_id_fk": {
+          "name": "invitation_workspace_grant_invitation_id_invitation_id_fk",
+          "tableFrom": "invitation_workspace_grant",
+          "tableTo": "invitation",
+          "columnsFrom": ["invitation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_workspace_grant_workspace_id_workspace_id_fk": {
+          "name": "invitation_workspace_grant_workspace_id_workspace_id_fk",
+          "tableFrom": "invitation_workspace_grant",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.job_execution_logs": {
+      "name": "job_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "schedule_id": {
+          "name": "schedule_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "job_execution_logs_schedule_id_idx": {
+          "name": "job_execution_logs_schedule_id_idx",
+          "columns": [
+            {
+              "expression": "schedule_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_workspace_started_at_idx": {
+          "name": "job_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_workspace_ended_at_id_idx": {
+          "name": "job_execution_logs_workspace_ended_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"ended_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_execution_id_unique": {
+          "name": "job_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_trigger_idx": {
+          "name": "job_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "job_execution_logs_schedule_id_workflow_schedule_id_fk": {
+          "name": "job_execution_logs_schedule_id_workflow_schedule_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workflow_schedule",
+          "columnsFrom": ["schedule_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "job_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "job_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.jwks": {
+      "name": "jwks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "public_key": {
+          "name": "public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "private_key": {
+          "name": "private_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base": {
+      "name": "knowledge_base",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "embedding_dimension": {
+          "name": "embedding_dimension",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1536
+        },
+        "chunking_config": {
+          "name": "chunking_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{\"maxSize\": 1024, \"minSize\": 1, \"overlap\": 200}'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_user_id_idx": {
+          "name": "kb_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_id_idx": {
+          "name": "kb_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_user_workspace_idx": {
+          "name": "kb_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_deleted_at_idx": {
+          "name": "kb_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_deleted_partial_idx": {
+          "name": "kb_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_base\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_name_active_unique": {
+          "name": "kb_workspace_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"knowledge_base\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_user_id_user_id_fk": {
+          "name": "knowledge_base_user_id_user_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "knowledge_base_workspace_id_workspace_id_fk": {
+          "name": "knowledge_base_workspace_id_workspace_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base_tag_definitions": {
+      "name": "knowledge_base_tag_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag_slot": {
+          "name": "tag_slot",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "field_type": {
+          "name": "field_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_tag_definitions_kb_slot_idx": {
+          "name": "kb_tag_definitions_kb_slot_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "tag_slot",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_display_name_idx": {
+          "name": "kb_tag_definitions_kb_display_name_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_id_idx": {
+          "name": "kb_tag_definitions_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_base_tag_definitions",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector": {
+      "name": "knowledge_connector",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connector_type": {
+          "name": "connector_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_config": {
+          "name": "source_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sync_mode": {
+          "name": "sync_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'full'"
+        },
+        "sync_interval_minutes": {
+          "name": "sync_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1440
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_sync_at": {
+          "name": "last_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_error": {
+          "name": "last_sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_doc_count": {
+          "name": "last_sync_doc_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_sync_at": {
+          "name": "next_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "consecutive_failures": {
+          "name": "consecutive_failures",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kc_knowledge_base_id_idx": {
+          "name": "kc_knowledge_base_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_status_next_sync_idx": {
+          "name": "kc_status_next_sync_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_sync_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_archived_at_partial_idx": {
+          "name": "kc_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_connector\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_deleted_at_partial_idx": {
+          "name": "kc_deleted_at_partial_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_connector\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_connector_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_connector",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector_sync_log": {
+      "name": "knowledge_connector_sync_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "docs_added": {
+          "name": "docs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_updated": {
+          "name": "docs_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_deleted": {
+          "name": "docs_deleted",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_unchanged": {
+          "name": "docs_unchanged",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_failed": {
+          "name": "docs_failed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kcsl_connector_id_idx": {
+          "name": "kcsl_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk": {
+          "name": "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "knowledge_connector_sync_log",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mcp_servers": {
+      "name": "mcp_servers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "transport": {
+          "name": "transport",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "headers": {
+          "name": "headers",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "timeout": {
+          "name": "timeout",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 30000
+        },
+        "retries": {
+          "name": "retries",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 3
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_connected": {
+          "name": "last_connected",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connection_status": {
+          "name": "connection_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'disconnected'"
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_config": {
+          "name": "status_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "tool_count": {
+          "name": "tool_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_tools_refresh": {
+          "name": "last_tools_refresh",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_requests": {
+          "name": "total_requests",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mcp_servers_workspace_enabled_idx": {
+          "name": "mcp_servers_workspace_enabled_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "mcp_servers_workspace_deleted_partial_idx": {
+          "name": "mcp_servers_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"mcp_servers\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mcp_servers_workspace_id_workspace_id_fk": {
+          "name": "mcp_servers_workspace_id_workspace_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mcp_servers_created_by_user_id_fk": {
+          "name": "mcp_servers_created_by_user_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.member": {
+      "name": "member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "member_user_id_unique": {
+          "name": "member_user_id_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "member_organization_id_idx": {
+          "name": "member_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "member_user_id_user_id_fk": {
+          "name": "member_user_id_user_id_fk",
+          "tableFrom": "member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "member_organization_id_organization_id_fk": {
+          "name": "member_organization_id_organization_id_fk",
+          "tableFrom": "member",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.memory": {
+      "name": "memory",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "memory_key_idx": {
+          "name": "memory_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_idx": {
+          "name": "memory_workspace_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_key_idx": {
+          "name": "memory_workspace_key_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_deleted_partial_idx": {
+          "name": "memory_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"memory\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "memory_workspace_id_workspace_id_fk": {
+          "name": "memory_workspace_id_workspace_id_fk",
+          "tableFrom": "memory",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_allowed_sender": {
+      "name": "mothership_inbox_allowed_sender",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "label": {
+          "name": "label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "added_by": {
+          "name": "added_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "inbox_sender_ws_email_idx": {
+          "name": "inbox_sender_ws_email_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_allowed_sender_added_by_user_id_fk": {
+          "name": "mothership_inbox_allowed_sender_added_by_user_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "user",
+          "columnsFrom": ["added_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_task": {
+      "name": "mothership_inbox_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_email": {
+          "name": "from_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_name": {
+          "name": "from_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subject": {
+          "name": "subject",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body_preview": {
+          "name": "body_preview",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_text": {
+          "name": "body_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_html": {
+          "name": "body_html",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_message_id": {
+          "name": "email_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "in_reply_to": {
+          "name": "in_reply_to",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_message_id": {
+          "name": "response_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "agentmail_message_id": {
+          "name": "agentmail_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'received'"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_job_id": {
+          "name": "trigger_job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "result_summary": {
+          "name": "result_summary",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejection_reason": {
+          "name": "rejection_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_attachments": {
+          "name": "has_attachments",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "cc_recipients": {
+          "name": "cc_recipients",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "inbox_task_ws_created_at_idx": {
+          "name": "inbox_task_ws_created_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_ws_status_idx": {
+          "name": "inbox_task_ws_status_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_response_msg_id_idx": {
+          "name": "inbox_task_response_msg_id_idx",
+          "columns": [
+            {
+              "expression": "response_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_email_msg_id_idx": {
+          "name": "inbox_task_email_msg_id_idx",
+          "columns": [
+            {
+              "expression": "email_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_task_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_task_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_task_chat_id_copilot_chats_id_fk": {
+          "name": "mothership_inbox_task_chat_id_copilot_chats_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_webhook": {
+      "name": "mothership_inbox_webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "webhook_id": {
+          "name": "webhook_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "mothership_inbox_webhook_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_webhook_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_webhook",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "mothership_inbox_webhook_workspace_id_unique": {
+          "name": "mothership_inbox_webhook_workspace_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["workspace_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_settings": {
+      "name": "mothership_settings",
+      "schema": "",
+      "columns": {
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "mcp_tool_refs": {
+          "name": "mcp_tool_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "custom_tool_refs": {
+          "name": "custom_tool_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "skill_refs": {
+          "name": "skill_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mothership_settings_workspace_id_idx": {
+          "name": "mothership_settings_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_settings_workspace_id_workspace_id_fk": {
+          "name": "mothership_settings_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_settings",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_access_token": {
+      "name": "oauth_access_token",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_access_token_access_token_idx": {
+          "name": "oauth_access_token_access_token_idx",
+          "columns": [
+            {
+              "expression": "access_token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "oauth_access_token_refresh_token_idx": {
+          "name": "oauth_access_token_refresh_token_idx",
+          "columns": [
+            {
+              "expression": "refresh_token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_access_token_client_id_oauth_application_client_id_fk": {
+          "name": "oauth_access_token_client_id_oauth_application_client_id_fk",
+          "tableFrom": "oauth_access_token",
+          "tableTo": "oauth_application",
+          "columnsFrom": ["client_id"],
+          "columnsTo": ["client_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_access_token_user_id_user_id_fk": {
+          "name": "oauth_access_token_user_id_user_id_fk",
+          "tableFrom": "oauth_access_token",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_access_token_access_token_unique": {
+          "name": "oauth_access_token_access_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["access_token"]
+        },
+        "oauth_access_token_refresh_token_unique": {
+          "name": "oauth_access_token_refresh_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["refresh_token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_application": {
+      "name": "oauth_application",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_secret": {
+          "name": "client_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "redirect_urls": {
+          "name": "redirect_urls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_application_client_id_idx": {
+          "name": "oauth_application_client_id_idx",
+          "columns": [
+            {
+              "expression": "client_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_application_user_id_user_id_fk": {
+          "name": "oauth_application_user_id_user_id_fk",
+          "tableFrom": "oauth_application",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_application_client_id_unique": {
+          "name": "oauth_application_client_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["client_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_consent": {
+      "name": "oauth_consent",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "consent_given": {
+          "name": "consent_given",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_consent_user_client_idx": {
+          "name": "oauth_consent_user_client_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "client_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_consent_client_id_oauth_application_client_id_fk": {
+          "name": "oauth_consent_client_id_oauth_application_client_id_fk",
+          "tableFrom": "oauth_consent",
+          "tableTo": "oauth_application",
+          "columnsFrom": ["client_id"],
+          "columnsTo": ["client_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_consent_user_id_user_id_fk": {
+          "name": "oauth_consent_user_id_user_id_fk",
+          "tableFrom": "oauth_consent",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organization": {
+      "name": "organization",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "whitelabel_settings": {
+          "name": "whitelabel_settings",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "data_retention_settings": {
+          "name": "data_retention_settings",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_usage_limit": {
+          "name": "org_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "departed_member_usage": {
+          "name": "departed_member_usage",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.outbox_event": {
+      "name": "outbox_event",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10
+        },
+        "available_at": {
+          "name": "available_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "locked_at": {
+          "name": "locked_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "outbox_event_status_available_idx": {
+          "name": "outbox_event_status_available_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "available_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "outbox_event_locked_at_idx": {
+          "name": "outbox_event_locked_at_idx",
+          "columns": [
+            {
+              "expression": "locked_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.paused_executions": {
+      "name": "paused_executions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_snapshot": {
+          "name": "execution_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pause_points": {
+          "name": "pause_points",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_pause_count": {
+          "name": "total_pause_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resumed_count": {
+          "name": "resumed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'paused'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "paused_at": {
+          "name": "paused_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_resume_at": {
+          "name": "next_resume_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "paused_executions_workflow_id_idx": {
+          "name": "paused_executions_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_status_idx": {
+          "name": "paused_executions_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_execution_id_unique": {
+          "name": "paused_executions_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_next_resume_at_idx": {
+          "name": "paused_executions_next_resume_at_idx",
+          "columns": [
+            {
+              "expression": "next_resume_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "status = 'paused' AND next_resume_at IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "paused_executions_workflow_id_workflow_id_fk": {
+          "name": "paused_executions_workflow_id_workflow_id_fk",
+          "tableFrom": "paused_executions",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.pending_credential_draft": {
+      "name": "pending_credential_draft",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "pending_draft_user_provider_ws": {
+          "name": "pending_draft_user_provider_ws",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "pending_credential_draft_user_id_user_id_fk": {
+          "name": "pending_credential_draft_user_id_user_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_workspace_id_workspace_id_fk": {
+          "name": "pending_credential_draft_workspace_id_workspace_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_credential_id_credential_id_fk": {
+          "name": "pending_credential_draft_credential_id_credential_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group": {
+      "name": "permission_group",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "auto_add_new_members": {
+          "name": "auto_add_new_members",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "permission_group_created_by_idx": {
+          "name": "permission_group_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_workspace_name_unique": {
+          "name": "permission_group_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_workspace_auto_add_unique": {
+          "name": "permission_group_workspace_auto_add_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "auto_add_new_members = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_workspace_id_workspace_id_fk": {
+          "name": "permission_group_workspace_id_workspace_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_created_by_user_id_fk": {
+          "name": "permission_group_created_by_user_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group_member": {
+      "name": "permission_group_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "permission_group_id": {
+          "name": "permission_group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "assigned_by": {
+          "name": "assigned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "assigned_at": {
+          "name": "assigned_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permission_group_member_group_id_idx": {
+          "name": "permission_group_member_group_id_idx",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_member_group_user_unique": {
+          "name": "permission_group_member_group_user_unique",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_member_workspace_user_unique": {
+          "name": "permission_group_member_workspace_user_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_member_permission_group_id_permission_group_id_fk": {
+          "name": "permission_group_member_permission_group_id_permission_group_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "permission_group",
+          "columnsFrom": ["permission_group_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_workspace_id_workspace_id_fk": {
+          "name": "permission_group_member_workspace_id_workspace_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_user_id_user_id_fk": {
+          "name": "permission_group_member_user_id_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_assigned_by_user_id_fk": {
+          "name": "permission_group_member_assigned_by_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["assigned_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permissions": {
+      "name": "permissions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_type": {
+          "name": "entity_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_id": {
+          "name": "entity_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission_type": {
+          "name": "permission_type",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permissions_user_id_idx": {
+          "name": "permissions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_entity_idx": {
+          "name": "permissions_entity_idx",
+          "columns": [
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_type_idx": {
+          "name": "permissions_user_entity_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_permission_idx": {
+          "name": "permissions_user_entity_permission_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "permission_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_idx": {
+          "name": "permissions_user_entity_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_unique_constraint": {
+          "name": "permissions_unique_constraint",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permissions_user_id_user_id_fk": {
+          "name": "permissions_user_id_user_id_fk",
+          "tableFrom": "permissions",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.rate_limit_bucket": {
+      "name": "rate_limit_bucket",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "tokens": {
+          "name": "tokens",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_refill_at": {
+          "name": "last_refill_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.resume_queue": {
+      "name": "resume_queue",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "paused_execution_id": {
+          "name": "paused_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_execution_id": {
+          "name": "parent_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "new_execution_id": {
+          "name": "new_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "context_id": {
+          "name": "context_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resume_input": {
+          "name": "resume_input",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "queued_at": {
+          "name": "queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "failure_reason": {
+          "name": "failure_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "resume_queue_parent_status_idx": {
+          "name": "resume_queue_parent_status_idx",
+          "columns": [
+            {
+              "expression": "parent_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "queued_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "resume_queue_new_execution_idx": {
+          "name": "resume_queue_new_execution_idx",
+          "columns": [
+            {
+              "expression": "new_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "resume_queue_paused_execution_id_paused_executions_id_fk": {
+          "name": "resume_queue_paused_execution_id_paused_executions_id_fk",
+          "tableFrom": "resume_queue",
+          "tableTo": "paused_executions",
+          "columnsFrom": ["paused_execution_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "impersonated_by": {
+          "name": "impersonated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "session_user_id_idx": {
+          "name": "session_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "session_token_idx": {
+          "name": "session_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "session_active_organization_id_organization_id_fk": {
+          "name": "session_active_organization_id_organization_id_fk",
+          "tableFrom": "session",
+          "tableTo": "organization",
+          "columnsFrom": ["active_organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "session_token_unique": {
+          "name": "session_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.settings": {
+      "name": "settings",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "theme": {
+          "name": "theme",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'system'"
+        },
+        "auto_connect": {
+          "name": "auto_connect",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "telemetry_enabled": {
+          "name": "telemetry_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "email_preferences": {
+          "name": "email_preferences",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "billing_usage_notifications_enabled": {
+          "name": "billing_usage_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "show_training_controls": {
+          "name": "show_training_controls",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "super_user_mode_enabled": {
+          "name": "super_user_mode_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "mothership_environment": {
+          "name": "mothership_environment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'default'"
+        },
+        "error_notifications_enabled": {
+          "name": "error_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "snap_to_grid_size": {
+          "name": "snap_to_grid_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "show_action_bar": {
+          "name": "show_action_bar",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "copilot_enabled_models": {
+          "name": "copilot_enabled_models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "copilot_auto_allowed_tools": {
+          "name": "copilot_auto_allowed_tools",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "last_active_workspace_id": {
+          "name": "last_active_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "settings_user_id_user_id_fk": {
+          "name": "settings_user_id_user_id_fk",
+          "tableFrom": "settings",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "settings_user_id_unique": {
+          "name": "settings_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.skill": {
+      "name": "skill",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "skill_workspace_name_unique": {
+          "name": "skill_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "skill_workspace_id_workspace_id_fk": {
+          "name": "skill_workspace_id_workspace_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "skill_user_id_user_id_fk": {
+          "name": "skill_user_id_user_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sso_provider": {
+      "name": "sso_provider",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "domain": {
+          "name": "domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "oidc_config": {
+          "name": "oidc_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "saml_config": {
+          "name": "saml_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "sso_provider_provider_id_idx": {
+          "name": "sso_provider_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_domain_idx": {
+          "name": "sso_provider_domain_idx",
+          "columns": [
+            {
+              "expression": "domain",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_user_id_idx": {
+          "name": "sso_provider_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_organization_id_idx": {
+          "name": "sso_provider_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sso_provider_user_id_user_id_fk": {
+          "name": "sso_provider_user_id_user_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "sso_provider_organization_id_organization_id_fk": {
+          "name": "sso_provider_organization_id_organization_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.subscription": {
+      "name": "subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan": {
+          "name": "plan",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_subscription_id": {
+          "name": "stripe_subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_start": {
+          "name": "period_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_end": {
+          "name": "period_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at_period_end": {
+          "name": "cancel_at_period_end",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "seats": {
+          "name": "seats",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_start": {
+          "name": "trial_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_end": {
+          "name": "trial_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "subscription_reference_status_idx": {
+          "name": "subscription_reference_status_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "check_enterprise_metadata": {
+          "name": "check_enterprise_metadata",
+          "value": "plan != 'enterprise' OR metadata IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.table_row_executions": {
+      "name": "table_row_executions",
+      "schema": "",
+      "columns": {
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "row_id": {
+          "name": "row_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_id": {
+          "name": "job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "running_block_ids": {
+          "name": "running_block_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "block_errors": {
+          "name": "block_errors",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "cancelled_at": {
+          "name": "cancelled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "table_row_executions_table_status_idx": {
+          "name": "table_row_executions_table_status_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"table_row_executions\".\"status\" IN ('queued', 'running', 'pending')",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_row_executions_execution_id_idx": {
+          "name": "table_row_executions_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"table_row_executions\".\"execution_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_row_executions_table_group_idx": {
+          "name": "table_row_executions_table_group_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "table_row_executions_table_id_user_table_definitions_id_fk": {
+          "name": "table_row_executions_table_id_user_table_definitions_id_fk",
+          "tableFrom": "table_row_executions",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_row_executions_row_id_user_table_rows_id_fk": {
+          "name": "table_row_executions_row_id_user_table_rows_id_fk",
+          "tableFrom": "table_row_executions",
+          "tableTo": "user_table_rows",
+          "columnsFrom": ["row_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "table_row_executions_row_id_group_id_pk": {
+          "name": "table_row_executions_row_id_group_id_pk",
+          "columns": ["row_id", "group_id"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.table_run_dispatches": {
+      "name": "table_run_dispatches",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mode": {
+          "name": "mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scope": {
+          "name": "scope",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "cursor": {
+          "name": "cursor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "is_manual_run": {
+          "name": "is_manual_run",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "requested_at": {
+          "name": "requested_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancelled_at": {
+          "name": "cancelled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "table_run_dispatches_active_idx": {
+          "name": "table_run_dispatches_active_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_run_dispatches_watchdog_idx": {
+          "name": "table_run_dispatches_watchdog_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "requested_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "table_run_dispatches_table_id_user_table_definitions_id_fk": {
+          "name": "table_run_dispatches_table_id_user_table_definitions_id_fk",
+          "tableFrom": "table_run_dispatches",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_run_dispatches_workspace_id_workspace_id_fk": {
+          "name": "table_run_dispatches_workspace_id_workspace_id_fk",
+          "tableFrom": "table_run_dispatches",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.template_creators": {
+      "name": "template_creators",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "reference_type": {
+          "name": "reference_type",
+          "type": "template_creator_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "profile_image_url": {
+          "name": "profile_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "details": {
+          "name": "details",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "verified": {
+          "name": "verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "template_creators_reference_idx": {
+          "name": "template_creators_reference_idx",
+          "columns": [
+            {
+              "expression": "reference_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_creators_reference_id_idx": {
+          "name": "template_creators_reference_id_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_creators_created_by_idx": {
+          "name": "template_creators_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "template_creators_created_by_user_id_fk": {
+          "name": "template_creators_created_by_user_id_fk",
+          "tableFrom": "template_creators",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.template_stars": {
+      "name": "template_stars",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "template_id": {
+          "name": "template_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "starred_at": {
+          "name": "starred_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "template_stars_user_id_idx": {
+          "name": "template_stars_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_id_idx": {
+          "name": "template_stars_template_id_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_user_template_idx": {
+          "name": "template_stars_user_template_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_user_idx": {
+          "name": "template_stars_template_user_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_starred_at_idx": {
+          "name": "template_stars_starred_at_idx",
+          "columns": [
+            {
+              "expression": "starred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_starred_at_idx": {
+          "name": "template_stars_template_starred_at_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "starred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_user_template_unique": {
+          "name": "template_stars_user_template_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "template_stars_user_id_user_id_fk": {
+          "name": "template_stars_user_id_user_id_fk",
+          "tableFrom": "template_stars",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "template_stars_template_id_templates_id_fk": {
+          "name": "template_stars_template_id_templates_id_fk",
+          "tableFrom": "template_stars",
+          "tableTo": "templates",
+          "columnsFrom": ["template_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.templates": {
+      "name": "templates",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "details": {
+          "name": "details",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "views": {
+          "name": "views",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "stars": {
+          "name": "stars",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "template_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "tags": {
+          "name": "tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "required_credentials": {
+          "name": "required_credentials",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "state": {
+          "name": "state",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "og_image_url": {
+          "name": "og_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "templates_status_idx": {
+          "name": "templates_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_creator_id_idx": {
+          "name": "templates_creator_id_idx",
+          "columns": [
+            {
+              "expression": "creator_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_views_idx": {
+          "name": "templates_views_idx",
+          "columns": [
+            {
+              "expression": "views",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_stars_idx": {
+          "name": "templates_stars_idx",
+          "columns": [
+            {
+              "expression": "stars",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_status_views_idx": {
+          "name": "templates_status_views_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "views",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_status_stars_idx": {
+          "name": "templates_status_stars_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "stars",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_created_at_idx": {
+          "name": "templates_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_updated_at_idx": {
+          "name": "templates_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "templates_workflow_id_workflow_id_fk": {
+          "name": "templates_workflow_id_workflow_id_fk",
+          "tableFrom": "templates",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "templates_creator_id_template_creators_id_fk": {
+          "name": "templates_creator_id_template_creators_id_fk",
+          "tableFrom": "templates",
+          "tableTo": "template_creators",
+          "columnsFrom": ["creator_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.usage_log": {
+      "name": "usage_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "category": {
+          "name": "category",
+          "type": "usage_log_category",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "usage_log_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "usage_log_user_created_at_idx": {
+          "name": "usage_log_user_created_at_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_source_idx": {
+          "name": "usage_log_source_idx",
+          "columns": [
+            {
+              "expression": "source",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workspace_id_idx": {
+          "name": "usage_log_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workflow_id_idx": {
+          "name": "usage_log_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workspace_created_at_idx": {
+          "name": "usage_log_workspace_created_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "usage_log_user_id_user_id_fk": {
+          "name": "usage_log_user_id_user_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "usage_log_workspace_id_workspace_id_fk": {
+          "name": "usage_log_workspace_id_workspace_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "usage_log_workflow_id_workflow_id_fk": {
+          "name": "usage_log_workflow_id_workflow_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "normalized_email": {
+          "name": "normalized_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'user'"
+        },
+        "banned": {
+          "name": "banned",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "ban_reason": {
+          "name": "ban_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ban_expires": {
+          "name": "ban_expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        },
+        "user_normalized_email_unique": {
+          "name": "user_normalized_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["normalized_email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_stats": {
+      "name": "user_stats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_manual_executions": {
+          "name": "total_manual_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_api_calls": {
+          "name": "total_api_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_webhook_triggers": {
+          "name": "total_webhook_triggers",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_scheduled_executions": {
+          "name": "total_scheduled_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_chat_executions": {
+          "name": "total_chat_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_executions": {
+          "name": "total_mcp_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_a2a_executions": {
+          "name": "total_a2a_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_tokens_used": {
+          "name": "total_tokens_used",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_usage_limit": {
+          "name": "current_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'5'"
+        },
+        "usage_limit_updated_at": {
+          "name": "usage_limit_updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "current_period_cost": {
+          "name": "current_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_cost": {
+          "name": "last_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "billed_overage_this_period": {
+          "name": "billed_overage_this_period",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "pro_period_cost_snapshot": {
+          "name": "pro_period_cost_snapshot",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "pro_period_cost_snapshot_at": {
+          "name": "pro_period_cost_snapshot_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "total_copilot_cost": {
+          "name": "total_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_copilot_cost": {
+          "name": "current_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_copilot_cost": {
+          "name": "last_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "total_copilot_tokens": {
+          "name": "total_copilot_tokens",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_copilot_calls": {
+          "name": "total_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_calls": {
+          "name": "total_mcp_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_cost": {
+          "name": "total_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_mcp_copilot_cost": {
+          "name": "current_period_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_active": {
+          "name": "last_active",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "billing_blocked": {
+          "name": "billing_blocked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "billing_blocked_reason": {
+          "name": "billing_blocked_reason",
+          "type": "billing_blocked_reason",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_stats_user_id_user_id_fk": {
+          "name": "user_stats_user_id_user_id_fk",
+          "tableFrom": "user_stats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_stats_user_id_unique": {
+          "name": "user_stats_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_definitions": {
+      "name": "user_table_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "schema": {
+          "name": "schema",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_rows": {
+          "name": "max_rows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10000
+        },
+        "row_count": {
+          "name": "row_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "user_table_def_workspace_id_idx": {
+          "name": "user_table_def_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_workspace_name_unique": {
+          "name": "user_table_def_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"user_table_definitions\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_archived_at_idx": {
+          "name": "user_table_def_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_workspace_archived_partial_idx": {
+          "name": "user_table_def_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"user_table_definitions\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_definitions_workspace_id_workspace_id_fk": {
+          "name": "user_table_definitions_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_definitions_created_by_user_id_fk": {
+          "name": "user_table_definitions_created_by_user_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_rows": {
+      "name": "user_table_rows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "user_table_rows_table_id_idx": {
+          "name": "user_table_rows_table_id_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_data_gin_idx": {
+          "name": "user_table_rows_data_gin_idx",
+          "columns": [
+            {
+              "expression": "data",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "user_table_rows_workspace_table_idx": {
+          "name": "user_table_rows_workspace_table_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_table_position_idx": {
+          "name": "user_table_rows_table_position_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "position",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_rows_table_id_user_table_definitions_id_fk": {
+          "name": "user_table_rows_table_id_user_table_definitions_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_workspace_id_workspace_id_fk": {
+          "name": "user_table_rows_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_created_by_user_id_fk": {
+          "name": "user_table_rows_created_by_user_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.verification": {
+      "name": "verification",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "verification_identifier_idx": {
+          "name": "verification_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "verification_expires_at_idx": {
+          "name": "verification_expires_at_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.waitlist": {
+      "name": "waitlist",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "waitlist_email_unique": {
+          "name": "waitlist_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.webhook": {
+      "name": "webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_config": {
+          "name": "provider_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "path_deployment_unique": {
+          "name": "path_deployment_unique",
+          "columns": [
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"webhook\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_webhook_on_workflow_id_block_id": {
+          "name": "idx_webhook_on_workflow_id_block_id",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_workflow_deployment_idx": {
+          "name": "webhook_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_credential_set_id_idx": {
+          "name": "webhook_credential_set_id_idx",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_archived_at_partial_idx": {
+          "name": "webhook_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"webhook\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "webhook_workflow_id_workflow_id_fk": {
+          "name": "webhook_workflow_id_workflow_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "webhook_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "webhook_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "webhook_credential_set_id_credential_set_id_fk": {
+          "name": "webhook_credential_set_id_credential_set_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow": {
+      "name": "workflow",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#3972F6'"
+        },
+        "last_synced": {
+          "name": "last_synced",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_deployed": {
+          "name": "is_deployed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deployed_at": {
+          "name": "deployed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public_api": {
+          "name": "is_public_api",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_user_id_idx": {
+          "name": "workflow_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_id_idx": {
+          "name": "workflow_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_user_workspace_idx": {
+          "name": "workflow_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_folder_name_active_unique": {
+          "name": "workflow_workspace_folder_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"folder_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_sort_idx": {
+          "name": "workflow_folder_sort_idx",
+          "columns": [
+            {
+              "expression": "folder_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_archived_at_idx": {
+          "name": "workflow_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_archived_partial_idx": {
+          "name": "workflow_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_user_id_user_id_fk": {
+          "name": "workflow_user_id_user_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_workspace_id_workspace_id_fk": {
+          "name": "workflow_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_id_workflow_folder_id_fk": {
+          "name": "workflow_folder_id_workflow_folder_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workflow_folder",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_blocks": {
+      "name": "workflow_blocks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_x": {
+          "name": "position_x",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_y": {
+          "name": "position_y",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "horizontal_handles": {
+          "name": "horizontal_handles",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "is_wide": {
+          "name": "is_wide",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "advanced_mode": {
+          "name": "advanced_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "trigger_mode": {
+          "name": "trigger_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "height": {
+          "name": "height",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "sub_blocks": {
+          "name": "sub_blocks",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "outputs": {
+          "name": "outputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_blocks_workflow_id_idx": {
+          "name": "workflow_blocks_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_blocks_type_idx": {
+          "name": "workflow_blocks_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_blocks_workflow_id_workflow_id_fk": {
+          "name": "workflow_blocks_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_blocks",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_checkpoints": {
+      "name": "workflow_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message_id": {
+          "name": "message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_state": {
+          "name": "workflow_state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_checkpoints_user_id_idx": {
+          "name": "workflow_checkpoints_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_id_idx": {
+          "name": "workflow_checkpoints_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_id_idx": {
+          "name": "workflow_checkpoints_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_message_id_idx": {
+          "name": "workflow_checkpoints_message_id_idx",
+          "columns": [
+            {
+              "expression": "message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_user_workflow_idx": {
+          "name": "workflow_checkpoints_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_chat_idx": {
+          "name": "workflow_checkpoints_workflow_chat_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_created_at_idx": {
+          "name": "workflow_checkpoints_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_created_at_idx": {
+          "name": "workflow_checkpoints_chat_created_at_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_checkpoints_user_id_user_id_fk": {
+          "name": "workflow_checkpoints_user_id_user_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_workflow_id_workflow_id_fk": {
+          "name": "workflow_checkpoints_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_chat_id_copilot_chats_id_fk": {
+          "name": "workflow_checkpoints_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_deployment_version": {
+      "name": "workflow_deployment_version",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_deployment_version_workflow_version_unique": {
+          "name": "workflow_deployment_version_workflow_version_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_workflow_active_idx": {
+          "name": "workflow_deployment_version_workflow_active_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_created_at_idx": {
+          "name": "workflow_deployment_version_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_deployment_version_workflow_id_workflow_id_fk": {
+          "name": "workflow_deployment_version_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_deployment_version",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_edges": {
+      "name": "workflow_edges",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_block_id": {
+          "name": "source_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_block_id": {
+          "name": "target_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_handle": {
+          "name": "source_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "target_handle": {
+          "name": "target_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_edges_workflow_id_idx": {
+          "name": "workflow_edges_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_source_idx": {
+          "name": "workflow_edges_workflow_source_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "source_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_target_idx": {
+          "name": "workflow_edges_workflow_target_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_edges_workflow_id_workflow_id_fk": {
+          "name": "workflow_edges_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_source_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_source_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["source_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_target_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_target_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["target_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_logs": {
+      "name": "workflow_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_snapshot_id": {
+          "name": "state_snapshot_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "files": {
+          "name": "files",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_execution_logs_workflow_id_idx": {
+          "name": "workflow_execution_logs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_state_snapshot_id_idx": {
+          "name": "workflow_execution_logs_state_snapshot_id_idx",
+          "columns": [
+            {
+              "expression": "state_snapshot_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_deployment_version_id_idx": {
+          "name": "workflow_execution_logs_deployment_version_id_idx",
+          "columns": [
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_trigger_idx": {
+          "name": "workflow_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_level_idx": {
+          "name": "workflow_execution_logs_level_idx",
+          "columns": [
+            {
+              "expression": "level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_started_at_idx": {
+          "name": "workflow_execution_logs_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_execution_id_unique": {
+          "name": "workflow_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workflow_started_at_idx": {
+          "name": "workflow_execution_logs_workflow_started_at_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_started_at_idx": {
+          "name": "workflow_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_ended_at_id_idx": {
+          "name": "workflow_execution_logs_workspace_ended_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"ended_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_running_started_at_idx": {
+          "name": "workflow_execution_logs_running_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "status = 'running'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_logs_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_logs_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "workflow_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk": {
+          "name": "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_execution_snapshots",
+          "columnsFrom": ["state_snapshot_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_snapshots": {
+      "name": "workflow_execution_snapshots",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state_hash": {
+          "name": "state_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_data": {
+          "name": "state_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_snapshots_workflow_id_idx": {
+          "name": "workflow_snapshots_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_hash_idx": {
+          "name": "workflow_snapshots_hash_idx",
+          "columns": [
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_workflow_hash_idx": {
+          "name": "workflow_snapshots_workflow_hash_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_created_at_idx": {
+          "name": "workflow_snapshots_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_snapshots_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_snapshots_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_snapshots",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_folder": {
+      "name": "workflow_folder",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'#6B7280'"
+        },
+        "is_expanded": {
+          "name": "is_expanded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_folder_user_idx": {
+          "name": "workflow_folder_user_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_parent_idx": {
+          "name": "workflow_folder_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_parent_sort_idx": {
+          "name": "workflow_folder_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_archived_at_idx": {
+          "name": "workflow_folder_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_archived_partial_idx": {
+          "name": "workflow_folder_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_folder\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_folder_user_id_user_id_fk": {
+          "name": "workflow_folder_user_id_user_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_workspace_id_workspace_id_fk": {
+          "name": "workflow_folder_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_server": {
+      "name": "workflow_mcp_server",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public": {
+          "name": "is_public",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_server_workspace_id_idx": {
+          "name": "workflow_mcp_server_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_created_by_idx": {
+          "name": "workflow_mcp_server_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_deleted_at_idx": {
+          "name": "workflow_mcp_server_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_workspace_deleted_partial_idx": {
+          "name": "workflow_mcp_server_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_mcp_server\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_server_workspace_id_workspace_id_fk": {
+          "name": "workflow_mcp_server_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_server_created_by_user_id_fk": {
+          "name": "workflow_mcp_server_created_by_user_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_tool": {
+      "name": "workflow_mcp_tool",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "server_id": {
+          "name": "server_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_description": {
+          "name": "tool_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parameter_schema": {
+          "name": "parameter_schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_tool_server_id_idx": {
+          "name": "workflow_mcp_tool_server_id_idx",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_workflow_id_idx": {
+          "name": "workflow_mcp_tool_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_server_workflow_unique": {
+          "name": "workflow_mcp_tool_server_workflow_unique",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_mcp_tool\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_archived_at_partial_idx": {
+          "name": "workflow_mcp_tool_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_mcp_tool\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk": {
+          "name": "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow_mcp_server",
+          "columnsFrom": ["server_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_tool_workflow_id_workflow_id_fk": {
+          "name": "workflow_mcp_tool_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_schedule": {
+      "name": "workflow_schedule",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cron_expression": {
+          "name": "cron_expression",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_ran_at": {
+          "name": "last_ran_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_queued_at": {
+          "name": "last_queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "timezone": {
+          "name": "timezone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'UTC'"
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_type": {
+          "name": "source_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'workflow'"
+        },
+        "job_title": {
+          "name": "job_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "prompt": {
+          "name": "prompt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lifecycle": {
+          "name": "lifecycle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'persistent'"
+        },
+        "success_condition": {
+          "name": "success_condition",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_runs": {
+          "name": "max_runs",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "source_chat_id": {
+          "name": "source_chat_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_task_name": {
+          "name": "source_task_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_user_id": {
+          "name": "source_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_workspace_id": {
+          "name": "source_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_history": {
+          "name": "job_history",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_schedule_workflow_block_deployment_unique": {
+          "name": "workflow_schedule_workflow_block_deployment_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_workflow_deployment_idx": {
+          "name": "workflow_schedule_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_archived_at_partial_idx": {
+          "name": "workflow_schedule_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_schedule_workflow_id_workflow_id_fk": {
+          "name": "workflow_schedule_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_user_id_user_id_fk": {
+          "name": "workflow_schedule_source_user_id_user_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "user",
+          "columnsFrom": ["source_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_workspace_id_workspace_id_fk": {
+          "name": "workflow_schedule_source_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workspace",
+          "columnsFrom": ["source_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_subflows": {
+      "name": "workflow_subflows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_subflows_workflow_id_idx": {
+          "name": "workflow_subflows_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_subflows_workflow_type_idx": {
+          "name": "workflow_subflows_workflow_type_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_subflows_workflow_id_workflow_id_fk": {
+          "name": "workflow_subflows_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_subflows",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace": {
+      "name": "workspace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#33C482'"
+        },
+        "logo_url": {
+          "name": "logo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_mode": {
+          "name": "workspace_mode",
+          "type": "workspace_mode",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'grandfathered_shared'"
+        },
+        "billed_account_user_id": {
+          "name": "billed_account_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "allow_personal_api_keys": {
+          "name": "allow_personal_api_keys",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "inbox_enabled": {
+          "name": "inbox_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "inbox_address": {
+          "name": "inbox_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "inbox_provider_id": {
+          "name": "inbox_provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_owner_id_idx": {
+          "name": "workspace_owner_id_idx",
+          "columns": [
+            {
+              "expression": "owner_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_organization_id_idx": {
+          "name": "workspace_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_mode_idx": {
+          "name": "workspace_mode_idx",
+          "columns": [
+            {
+              "expression": "workspace_mode",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_owner_id_user_id_fk": {
+          "name": "workspace_owner_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["owner_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_organization_id_organization_id_fk": {
+          "name": "workspace_organization_id_organization_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workspace_billed_account_user_id_user_id_fk": {
+          "name": "workspace_billed_account_user_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["billed_account_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_byok_keys": {
+      "name": "workspace_byok_keys",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_byok_provider_unique": {
+          "name": "workspace_byok_provider_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_byok_workspace_idx": {
+          "name": "workspace_byok_workspace_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_byok_keys_workspace_id_workspace_id_fk": {
+          "name": "workspace_byok_keys_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_byok_keys_created_by_user_id_fk": {
+          "name": "workspace_byok_keys_created_by_user_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_environment": {
+      "name": "workspace_environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_environment_workspace_unique": {
+          "name": "workspace_environment_workspace_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_environment_workspace_id_workspace_id_fk": {
+          "name": "workspace_environment_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_environment",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_file": {
+      "name": "workspace_file",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_by": {
+          "name": "uploaded_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_file_workspace_id_idx": {
+          "name": "workspace_file_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_key_idx": {
+          "name": "workspace_file_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_deleted_at_idx": {
+          "name": "workspace_file_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_workspace_deleted_partial_idx": {
+          "name": "workspace_file_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_file\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_file_workspace_id_workspace_id_fk": {
+          "name": "workspace_file_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_uploaded_by_user_id_fk": {
+          "name": "workspace_file_uploaded_by_user_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "user",
+          "columnsFrom": ["uploaded_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_file_key_unique": {
+          "name": "workspace_file_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_file_folders": {
+      "name": "workspace_file_folders",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_file_folders_workspace_parent_idx": {
+          "name": "workspace_file_folders_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_parent_sort_idx": {
+          "name": "workspace_file_folders_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_deleted_at_idx": {
+          "name": "workspace_file_folders_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_workspace_deleted_partial_idx": {
+          "name": "workspace_file_folders_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_file_folders\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_workspace_parent_name_active_unique": {
+          "name": "workspace_file_folders_workspace_parent_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"parent_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_file_folders\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_file_folders_user_id_user_id_fk": {
+          "name": "workspace_file_folders_user_id_user_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_folders_workspace_id_workspace_id_fk": {
+          "name": "workspace_file_folders_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_folders_parent_id_workspace_file_folders_id_fk": {
+          "name": "workspace_file_folders_parent_id_workspace_file_folders_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "workspace_file_folders",
+          "columnsFrom": ["parent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_files": {
+      "name": "workspace_files",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_name": {
+          "name": "original_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_files_key_active_unique": {
+          "name": "workspace_files_key_active_unique",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_folder_name_active_unique": {
+          "name": "workspace_files_workspace_folder_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"folder_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "original_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL AND \"workspace_files\".\"context\" = 'workspace' AND \"workspace_files\".\"workspace_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_chat_display_name_unique": {
+          "name": "workspace_files_chat_display_name_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"context\" = 'mothership' AND \"workspace_files\".\"chat_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_key_idx": {
+          "name": "workspace_files_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_user_id_idx": {
+          "name": "workspace_files_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_id_idx": {
+          "name": "workspace_files_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_folder_id_idx": {
+          "name": "workspace_files_folder_id_idx",
+          "columns": [
+            {
+              "expression": "folder_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_context_idx": {
+          "name": "workspace_files_context_idx",
+          "columns": [
+            {
+              "expression": "context",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_chat_id_idx": {
+          "name": "workspace_files_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_deleted_at_idx": {
+          "name": "workspace_files_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_deleted_partial_idx": {
+          "name": "workspace_files_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_files\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_files_user_id_user_id_fk": {
+          "name": "workspace_files_user_id_user_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_workspace_id_workspace_id_fk": {
+          "name": "workspace_files_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_folder_id_workspace_file_folders_id_fk": {
+          "name": "workspace_files_folder_id_workspace_file_folders_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "workspace_file_folders",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workspace_files_chat_id_copilot_chats_id_fk": {
+          "name": "workspace_files_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_notification_delivery": {
+      "name": "workspace_notification_delivery",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "subscription_id": {
+          "name": "subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "notification_delivery_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_attempt_at": {
+          "name": "last_attempt_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_attempt_at": {
+          "name": "next_attempt_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_status": {
+          "name": "response_status",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_body": {
+          "name": "response_body",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_notification_delivery_subscription_id_idx": {
+          "name": "workspace_notification_delivery_subscription_id_idx",
+          "columns": [
+            {
+              "expression": "subscription_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_execution_id_idx": {
+          "name": "workspace_notification_delivery_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_status_idx": {
+          "name": "workspace_notification_delivery_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_next_attempt_idx": {
+          "name": "workspace_notification_delivery_next_attempt_idx",
+          "columns": [
+            {
+              "expression": "next_attempt_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_notification_delivery_subscription_id_workspace_notification_subscription_id_fk": {
+          "name": "workspace_notification_delivery_subscription_id_workspace_notification_subscription_id_fk",
+          "tableFrom": "workspace_notification_delivery",
+          "tableTo": "workspace_notification_subscription",
+          "columnsFrom": ["subscription_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_notification_delivery_workflow_id_workflow_id_fk": {
+          "name": "workspace_notification_delivery_workflow_id_workflow_id_fk",
+          "tableFrom": "workspace_notification_delivery",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_notification_subscription": {
+      "name": "workspace_notification_subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "notification_type": {
+          "name": "notification_type",
+          "type": "notification_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_ids": {
+          "name": "workflow_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "all_workflows": {
+          "name": "all_workflows",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "level_filter": {
+          "name": "level_filter",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY['info', 'error']::text[]"
+        },
+        "trigger_filter": {
+          "name": "trigger_filter",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY['api', 'webhook', 'schedule', 'manual', 'chat']::text[]"
+        },
+        "include_final_output": {
+          "name": "include_final_output",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_trace_spans": {
+          "name": "include_trace_spans",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_rate_limits": {
+          "name": "include_rate_limits",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_usage_data": {
+          "name": "include_usage_data",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "webhook_config": {
+          "name": "webhook_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_recipients": {
+          "name": "email_recipients",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "slack_config": {
+          "name": "slack_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alert_config": {
+          "name": "alert_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_alert_at": {
+          "name": "last_alert_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "active": {
+          "name": "active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_notification_workspace_id_idx": {
+          "name": "workspace_notification_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_active_idx": {
+          "name": "workspace_notification_active_idx",
+          "columns": [
+            {
+              "expression": "active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_type_idx": {
+          "name": "workspace_notification_type_idx",
+          "columns": [
+            {
+              "expression": "notification_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_notification_subscription_workspace_id_workspace_id_fk": {
+          "name": "workspace_notification_subscription_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_notification_subscription",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_notification_subscription_created_by_user_id_fk": {
+          "name": "workspace_notification_subscription_created_by_user_id_fk",
+          "tableFrom": "workspace_notification_subscription",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.a2a_task_status": {
+      "name": "a2a_task_status",
+      "schema": "public",
+      "values": [
+        "submitted",
+        "working",
+        "input-required",
+        "completed",
+        "failed",
+        "canceled",
+        "rejected",
+        "auth-required",
+        "unknown"
+      ]
+    },
+    "public.academy_cert_status": {
+      "name": "academy_cert_status",
+      "schema": "public",
+      "values": ["active", "revoked", "expired"]
+    },
+    "public.billing_blocked_reason": {
+      "name": "billing_blocked_reason",
+      "schema": "public",
+      "values": ["payment_failed", "dispute"]
+    },
+    "public.chat_type": {
+      "name": "chat_type",
+      "schema": "public",
+      "values": ["mothership", "copilot"]
+    },
+    "public.copilot_async_tool_status": {
+      "name": "copilot_async_tool_status",
+      "schema": "public",
+      "values": ["pending", "running", "completed", "failed", "cancelled", "delivered"]
+    },
+    "public.copilot_run_status": {
+      "name": "copilot_run_status",
+      "schema": "public",
+      "values": ["active", "paused_waiting_for_tool", "resuming", "complete", "error", "cancelled"]
+    },
+    "public.credential_member_role": {
+      "name": "credential_member_role",
+      "schema": "public",
+      "values": ["admin", "member"]
+    },
+    "public.credential_member_status": {
+      "name": "credential_member_status",
+      "schema": "public",
+      "values": ["active", "pending", "revoked"]
+    },
+    "public.credential_set_invitation_status": {
+      "name": "credential_set_invitation_status",
+      "schema": "public",
+      "values": ["pending", "accepted", "expired", "cancelled"]
+    },
+    "public.credential_set_member_status": {
+      "name": "credential_set_member_status",
+      "schema": "public",
+      "values": ["active", "pending", "revoked"]
+    },
+    "public.credential_type": {
+      "name": "credential_type",
+      "schema": "public",
+      "values": ["oauth", "env_workspace", "env_personal", "service_account"]
+    },
+    "public.data_drain_cadence": {
+      "name": "data_drain_cadence",
+      "schema": "public",
+      "values": ["hourly", "daily"]
+    },
+    "public.data_drain_destination": {
+      "name": "data_drain_destination",
+      "schema": "public",
+      "values": ["s3", "gcs", "azure_blob", "datadog", "bigquery", "snowflake", "webhook"]
+    },
+    "public.data_drain_run_status": {
+      "name": "data_drain_run_status",
+      "schema": "public",
+      "values": ["running", "success", "failed"]
+    },
+    "public.data_drain_run_trigger": {
+      "name": "data_drain_run_trigger",
+      "schema": "public",
+      "values": ["cron", "manual"]
+    },
+    "public.data_drain_source": {
+      "name": "data_drain_source",
+      "schema": "public",
+      "values": ["workflow_logs", "job_logs", "audit_logs", "copilot_chats", "copilot_runs"]
+    },
+    "public.invitation_kind": {
+      "name": "invitation_kind",
+      "schema": "public",
+      "values": ["organization", "workspace"]
+    },
+    "public.invitation_membership_intent": {
+      "name": "invitation_membership_intent",
+      "schema": "public",
+      "values": ["internal", "external"]
+    },
+    "public.invitation_status": {
+      "name": "invitation_status",
+      "schema": "public",
+      "values": ["pending", "accepted", "rejected", "cancelled", "expired"]
+    },
+    "public.notification_delivery_status": {
+      "name": "notification_delivery_status",
+      "schema": "public",
+      "values": ["pending", "in_progress", "success", "failed"]
+    },
+    "public.notification_type": {
+      "name": "notification_type",
+      "schema": "public",
+      "values": ["webhook", "email", "slack"]
+    },
+    "public.permission_type": {
+      "name": "permission_type",
+      "schema": "public",
+      "values": ["admin", "write", "read"]
+    },
+    "public.template_creator_type": {
+      "name": "template_creator_type",
+      "schema": "public",
+      "values": ["user", "organization"]
+    },
+    "public.template_status": {
+      "name": "template_status",
+      "schema": "public",
+      "values": ["pending", "approved", "rejected"]
+    },
+    "public.usage_log_category": {
+      "name": "usage_log_category",
+      "schema": "public",
+      "values": ["model", "fixed"]
+    },
+    "public.usage_log_source": {
+      "name": "usage_log_source",
+      "schema": "public",
+      "values": [
+        "workflow",
+        "wand",
+        "copilot",
+        "workspace-chat",
+        "mcp_copilot",
+        "mothership_block",
+        "knowledge-base",
+        "voice-input"
+      ]
+    },
+    "public.workspace_mode": {
+      "name": "workspace_mode",
+      "schema": "public",
+      "values": ["personal", "organization", "grandfathered_shared"]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/packages/db/migrations/meta/_journal.json b/packages/db/migrations/meta/_journal.json
index 36023183249..1dd9764d85e 100644
--- a/packages/db/migrations/meta/_journal.json
+++ b/packages/db/migrations/meta/_journal.json
@@ -1457,6 +1457,13 @@
       "when": 1778714378630,
       "tag": "0208_modern_power_man",
       "breakpoints": true
+    },
+    {
+      "idx": 209,
+      "version": "7",
+      "when": 1779246572978,
+      "tag": "0209_smiling_fixer",
+      "breakpoints": true
     }
   ]
 }
diff --git a/packages/db/schema.ts b/packages/db/schema.ts
index ddeab5dd6cf..fe2913d3c89 100644
--- a/packages/db/schema.ts
+++ b/packages/db/schema.ts
@@ -13,6 +13,7 @@ import {
   jsonb,
   pgEnum,
   pgTable,
+  primaryKey,
   text,
   timestamp,
   uniqueIndex,
@@ -2989,13 +2990,6 @@ export const userTableRows = pgTable(
       .notNull()
       .references(() => workspace.id, { onDelete: 'cascade' }),
     data: jsonb('data').notNull(),
-    /**
-     * Per-row workflow-group execution state, keyed by `WorkflowGroup.id`.
-     * Each entry holds status / executionId / jobId / blockErrors /
-     * runningBlockIds for one group's run on this row. Empty `{}` means no
-     * group has run for this row yet.
-     */
-    executions: jsonb('executions').notNull().default({}),
     position: integer('position').notNull().default(0),
     createdAt: timestamp('created_at').notNull().defaultNow(),
     updatedAt: timestamp('updated_at').notNull().defaultNow(),
@@ -3012,6 +3006,91 @@ export const userTableRows = pgTable(
   })
 )
 
+/**
+ * Per-row workflow-group execution state. One row per (rowId, groupId) — the
+ * group's run metadata (status, executionId, jobId, blockErrors, etc.) for
+ * one row of one user-defined table.
+ *
+ * Lives in a sidecar table (not a JSONB column on `user_table_rows`) so the
+ * dispatcher and "X running" counter can hit `(table_id, status)` and
+ * `(table_id, group_id)` indexes directly instead of walking JSONB blobs, and
+ * so each cell-write rewrites only its own row instead of the whole
+ * executions object on the parent row tuple.
+ */
+export const tableRowExecutions = pgTable(
+  'table_row_executions',
+  {
+    tableId: text('table_id')
+      .notNull()
+      .references(() => userTableDefinitions.id, { onDelete: 'cascade' }),
+    rowId: text('row_id')
+      .notNull()
+      .references(() => userTableRows.id, { onDelete: 'cascade' }),
+    groupId: text('group_id').notNull(),
+    status: text('status').notNull(),
+    executionId: text('execution_id'),
+    jobId: text('job_id'),
+    workflowId: text('workflow_id').notNull(),
+    error: text('error'),
+    runningBlockIds: text('running_block_ids').array().notNull().default(sql`'{}'::text[]`),
+    blockErrors: jsonb('block_errors').notNull().default({}),
+    cancelledAt: timestamp('cancelled_at'),
+    updatedAt: timestamp('updated_at').notNull().defaultNow(),
+  },
+  (table) => ({
+    pk: primaryKey({ columns: [table.rowId, table.groupId] }),
+    tableStatusInFlightIdx: index('table_row_executions_table_status_idx')
+      .on(table.tableId, table.status)
+      .where(sql`${table.status} IN ('queued', 'running', 'pending')`),
+    executionIdIdx: index('table_row_executions_execution_id_idx')
+      .on(table.executionId)
+      .where(sql`${table.executionId} IS NOT NULL`),
+    tableGroupIdx: index('table_row_executions_table_group_idx').on(table.tableId, table.groupId),
+  })
+)
+
+/**
+ * One row per "Run column / Run row / Run all rows" gesture on a user table.
+ * The dispatcher task walks the table in row-position windows, advancing
+ * `cursor` as it enqueues cells into trigger.dev. Cancel flips `status` to
+ * `'cancelled'` in one write; the dispatcher bails at the next iteration and
+ * a bulk-SQL cell-cancel sweep neuters anything still in trigger.dev's queue
+ * (workers no-op on pickup via the cancel-sticky guard).
+ */
+export const tableRunDispatches = pgTable(
+  'table_run_dispatches',
+  {
+    id: text('id').primaryKey(),
+    tableId: text('table_id')
+      .notNull()
+      .references(() => userTableDefinitions.id, { onDelete: 'cascade' }),
+    workspaceId: text('workspace_id')
+      .notNull()
+      .references(() => workspace.id, { onDelete: 'cascade' }),
+    requestId: text('request_id').notNull(),
+    /** `'all'` re-runs completed cells; `'incomplete'` skips them. */
+    mode: text('mode').notNull(),
+    /** `{ groupIds: string[], rowIds?: string[] }` — the run's scope. */
+    scope: jsonb('scope').notNull(),
+    /** `pending` → `dispatching` → `complete` | `cancelled`. */
+    status: text('status').notNull().default('pending'),
+    /** Highest `user_table_rows.position` we've already enqueued cells for. */
+    cursor: integer('cursor').notNull().default(0),
+    /** When true, eligibility bypasses `autoRun: false` skip and treats
+     *  terminal states as re-runnable. Auto-fire paths (row inserts,
+     *  CSV import, addWorkflowGroup) set this to false so the dispatch
+     *  honors the autoRun toggle. */
+    isManualRun: boolean('is_manual_run').notNull().default(true),
+    requestedAt: timestamp('requested_at').notNull().defaultNow(),
+    completedAt: timestamp('completed_at'),
+    cancelledAt: timestamp('cancelled_at'),
+  },
+  (table) => ({
+    activeIdx: index('table_run_dispatches_active_idx').on(table.tableId, table.status),
+    watchdogIdx: index('table_run_dispatches_watchdog_idx').on(table.status, table.requestedAt),
+  })
+)
+
 export const oauthApplication = pgTable(
   'oauth_application',
   {
diff --git a/packages/testing/src/mocks/database.mock.ts b/packages/testing/src/mocks/database.mock.ts
index b73eb3566e7..98dda999745 100644
--- a/packages/testing/src/mocks/database.mock.ts
+++ b/packages/testing/src/mocks/database.mock.ts
@@ -115,7 +115,18 @@ const forClause = vi.fn(forBuilder)
 const onConflictDoUpdate = vi.fn(() => ({ returning }) as unknown as Promise<void>)
 const onConflictDoNothing = vi.fn(() => ({ returning }) as unknown as Promise<void>)
 
-const whereBuilder = () => ({ limit, orderBy, returning, groupBy, for: forClause })
+const whereBuilder = () => {
+  // Some call sites (e.g. `db.select().from(t).where(eq(...))` with no
+  // limit/orderBy) await the where directly. Make the builder a thenable so
+  // those calls resolve to the default empty array.
+  const thenable: any = Promise.resolve([] as unknown[])
+  thenable.limit = limit
+  thenable.orderBy = orderBy
+  thenable.returning = returning
+  thenable.groupBy = groupBy
+  thenable.for = forClause
+  return thenable
+}
 const where = vi.fn(whereBuilder)
 
 const joinBuilder = (): { where: typeof where; innerJoin: any; leftJoin: any } => ({
diff --git a/packages/testing/src/mocks/schema.mock.ts b/packages/testing/src/mocks/schema.mock.ts
index ba91d9d7746..66e14fabe0c 100644
--- a/packages/testing/src/mocks/schema.mock.ts
+++ b/packages/testing/src/mocks/schema.mock.ts
@@ -1141,6 +1141,34 @@ export const schemaMock = {
     updatedAt: 'updatedAt',
     createdBy: 'createdBy',
   },
+  tableRowExecutions: {
+    tableId: 'tableId',
+    rowId: 'rowId',
+    groupId: 'groupId',
+    status: 'status',
+    executionId: 'executionId',
+    jobId: 'jobId',
+    workflowId: 'workflowId',
+    error: 'error',
+    runningBlockIds: 'runningBlockIds',
+    blockErrors: 'blockErrors',
+    cancelledAt: 'cancelledAt',
+    updatedAt: 'updatedAt',
+  },
+  tableRunDispatches: {
+    id: 'id',
+    tableId: 'tableId',
+    workspaceId: 'workspaceId',
+    requestId: 'requestId',
+    mode: 'mode',
+    scope: 'scope',
+    status: 'status',
+    cursor: 'cursor',
+    isManualRun: 'isManualRun',
+    requestedAt: 'requestedAt',
+    completedAt: 'completedAt',
+    cancelledAt: 'cancelledAt',
+  },
   oauthApplication: {
     id: 'id',
     name: 'name',
diff --git a/scripts/check-api-validation-contracts.ts b/scripts/check-api-validation-contracts.ts
index 8bd93e9545a..3f8b4f77c87 100644
--- a/scripts/check-api-validation-contracts.ts
+++ b/scripts/check-api-validation-contracts.ts
@@ -9,8 +9,8 @@ const QUERY_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/queries')
 const SELECTOR_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/selectors')
 
 const BASELINE = {
-  totalRoutes: 746,
-  zodRoutes: 746,
+  totalRoutes: 747,
+  zodRoutes: 747,
   nonZodRoutes: 0,
 } as const
 

From d9dd7a3e55ce6a33706ef129471c42545831cd43 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 10:55:26 -0700
Subject: [PATCH 02/16] fix(cors): re-enable credentials on chat/form embed
 CORS policy (#4673)

* fix(cors): re-enable credentials on embed CORS policy

Chat and form embeds authenticate via the chat_auth_<id> / form auth
cookie set by setDeploymentAuthCookie. The previous PR set
Access-Control-Allow-Credentials: false on these routes, which made the
browser drop the auth cookie and produce 401s on subsequent embed calls
after login. Restore credentials: true (matching pre-consolidation
behavior) while keeping reflected origin and Vary: Origin.

The wildcard fallback when Origin is absent now also drops credentials
to stay CORS-spec-compliant.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* chore(cors): trim verbose comments in proxy

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* chore(cors): restore concise TSDoc on proxy CORS helpers

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
---
 apps/sim/proxy.test.ts | 16 ++++++++-------
 apps/sim/proxy.ts      | 45 ++++++++++++------------------------------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/apps/sim/proxy.test.ts b/apps/sim/proxy.test.ts
index 0282d670cd3..9311b146358 100644
--- a/apps/sim/proxy.test.ts
+++ b/apps/sim/proxy.test.ts
@@ -44,7 +44,7 @@ describe('resolveApiCorsPolicy', () => {
     expect(policy.headers).toContain('X-API-Key')
   })
 
-  it('reflects origin for chat and form embeds, never sets credentials', () => {
+  it('reflects origin for chat and form embeds with credentials enabled', () => {
     const paths = [
       '/api/chat/abc',
       '/api/chat/abc/otp',
@@ -56,13 +56,19 @@ describe('resolveApiCorsPolicy', () => {
       const policy = resolveApiCorsPolicy(makeRequest(path, 'https://customer.example'))
       expect(policy).toEqual({
         origin: 'https://customer.example',
-        credentials: false,
+        credentials: true,
         methods: 'GET, POST, PUT, OPTIONS',
         headers: 'Content-Type, X-Requested-With',
       })
     }
   })
 
+  it('drops credentials on embed policy when Origin header is absent (CORS spec invariant)', () => {
+    const policy = resolveApiCorsPolicy(makeRequest('/api/chat/abc'))
+    expect(policy.origin).toBe('*')
+    expect(policy.credentials).toBe(false)
+  })
+
   it('allows PUT on the embed policy (used by OTP verification on /[identifier]/otp)', () => {
     const policy = resolveApiCorsPolicy(
       makeRequest('/api/chat/abc/otp', 'https://customer.example')
@@ -70,16 +76,12 @@ describe('resolveApiCorsPolicy', () => {
     expect(policy.methods).toContain('PUT')
   })
 
-  it('falls back to wildcard for chat/form embeds when no origin header is present', () => {
-    expect(resolveApiCorsPolicy(makeRequest('/api/chat/abc')).origin).toBe('*')
-  })
-
   it('applies the embed policy to future identifier subroutes (not just /otp, /sso)', () => {
     const policy = resolveApiCorsPolicy(
       makeRequest('/api/chat/abc/transcript', 'https://customer.example')
     )
     expect(policy.origin).toBe('https://customer.example')
-    expect(policy.credentials).toBe(false)
+    expect(policy.credentials).toBe(true)
   })
 
   it('uses the default credentialed policy for workspace-internal chat/form routes', () => {
diff --git a/apps/sim/proxy.ts b/apps/sim/proxy.ts
index a5b8ea6df90..1bf1ccac505 100644
--- a/apps/sim/proxy.ts
+++ b/apps/sim/proxy.ts
@@ -22,19 +22,10 @@ const DEFAULT_API_ALLOWED_HEADERS =
 const WORKFLOW_EXECUTE_HEADERS =
   'X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version, X-API-Key'
 
-/**
- * Workspace-internal segments under /api/{chat,form}/* that must NOT
- * receive the embed policy. They serve the workspace UI with session
- * cookies and need the default credentialed policy.
- */
+/** Subpaths under /api/{chat,form}/* that serve the workspace UI, not embeds. */
 const EMBED_RESERVED_SEGMENTS = new Set(['manage', 'validate'])
 
-/**
- * True for /api/{chat,form}/[identifier] and any deeper subroute
- * (e.g. /otp, /sso). The identifier segment is explicitly checked
- * against EMBED_RESERVED_SEGMENTS so workspace-internal routes fall
- * through to the default credentialed policy.
- */
+/** True for /api/{chat,form}/[identifier] and any deeper subroute. */
 function isEmbedPath(pathname: string): boolean {
   const segments = pathname.split('/')
   if (segments.length < 4) return false
@@ -79,20 +70,16 @@ const CORS_RULES: readonly CorsRule[] = [
     }),
   },
   {
-    // Embed endpoints: /api/chat/[identifier] and /api/form/[identifier]
-    // (plus their /otp and /sso subroutes). These run on customer domains —
-    // reflect the request origin and omit credentials (auth uses signed
-    // tokens, not cookies). Workspace-internal subpaths (`manage`, `validate`,
-    // and the bare collection routes) are deliberately excluded so they
-    // continue to receive the default credentialed policy.
     match: (p) => isEmbedPath(p),
-    policy: (request) => ({
-      origin: request.headers.get('origin') || '*',
-      credentials: false,
-      // PUT is required for OTP verification on /[identifier]/otp.
-      methods: 'GET, POST, PUT, OPTIONS',
-      headers: 'Content-Type, X-Requested-With',
-    }),
+    policy: (request) => {
+      const requestOrigin = request.headers.get('origin')
+      return {
+        origin: requestOrigin || '*',
+        credentials: !!requestOrigin,
+        methods: 'GET, POST, PUT, OPTIONS',
+        headers: 'Content-Type, X-Requested-With',
+      }
+    },
   },
   {
     match: (p) => /^\/api\/workflows\/[^/]+\/execute$/.test(p),
@@ -105,10 +92,7 @@ const CORS_RULES: readonly CorsRule[] = [
   },
 ]
 
-/**
- * Single source of truth for CORS on /api/* — next.config.ts headers are
- * baked at build time and would freeze NEXT_PUBLIC_APP_URL into the image.
- */
+/** Single source of truth for /api/* CORS — resolved at request time, not baked at build. */
 export function resolveApiCorsPolicy(request: NextRequest): CorsPolicy {
   const { pathname } = request.nextUrl
   for (const rule of CORS_RULES) {
@@ -134,10 +118,7 @@ function applyCorsHeaders(response: NextResponse, policy: CorsPolicy): void {
   }
 }
 
-/**
- * Short-circuit preflight: Next's auto-OPTIONS for route handlers without
- * an explicit OPTIONS export does not carry middleware headers.
- */
+/** Next's auto-OPTIONS doesn't carry middleware headers, so we answer preflight here. */
 function buildPreflightResponse(policy: CorsPolicy): NextResponse {
   const response = new NextResponse(null, { status: 204 })
   applyCorsHeaders(response, policy)

From 46db40620ff84e2e42e7a20b74ff8b515d11c5fe Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 12:10:04 -0700
Subject: [PATCH 03/16] feat(mcp): OAuth 2.1 + PKCE for outbound MCP servers
 (#4441)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(mcp): OAuth 2.1 support for outbound MCP servers

* fix(mcp): tighten OAuth refresh race and session-error detection

Re-load the OAuth row inside withMcpOauthRefreshLock so concurrent
callers observe predecessor-written tokens instead of a stale snapshot
loaded before lock acquisition. Without this, the second caller's
provider held a rotated-out refresh token and the SDK tripped
invalid_grant, forcing reauthorization.

Switch isSessionError to match the SDK's typed StreamableHTTPError
(code 404/400) instead of substring-checking arbitrary error messages,
removing false positives on URLs that happen to contain those digits.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* refactor(mcp): tighten OAuth callback contract and registration metadata

- Validate callback query params via mcpOauthCallbackContract instead of
  raw searchParams.get, matching the rest of the MCP route surface.
- Drop non-RFC-7591 application_type field from dynamic client registration
  to avoid rejection by strict authorization servers.
- Collapse the pre-lock OAuth row load in createClient — the row is now
  loaded exclusively inside withMcpOauthRefreshLock, removing a redundant
  query and a stale-snapshot path.

* fix(mcp): narrow workspaceId before async closure in OAuth createClient

* fix(mcp): return authType from create-server endpoint

The POST /api/mcp/servers handler omitted authType from the success
response, so useCreateMcpServer always saw data.data.authType as
undefined and never triggered the OAuth popup after creating an
OAuth-protected server. Thread authType through performCreateMcpServer
into the response so the client can decide whether to auto-start OAuth.

* fix(mcp): mirror server null normalization in optimistic oauthClientId update

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* fix(mcp): revert optimistic oauthClientId to undefined to match McpServer type

The response contract preprocesses null → undefined, so McpServer.oauthClientId
is string | undefined. Using null broke type checking.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* fix(mcp): tighten OAuth probe signal and clear stale popup interval

- probe: only classify as OAuth on resource_metadata or scope params.
  Bare `Bearer error="invalid_token"` is generic and used by API-key servers,
  so it must not auto-flip the auth type to OAuth.
- popup hook: clear any existing close-watcher interval before overwriting
  when startOauthForServer is invoked twice for the same serverId.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* fix(mcp): normalize empty-string oauthClientId at route boundary

Orchestration already converts falsy → null via `|| null` (server-lifecycle.ts),
so the DB was never receiving an empty string. Tightening the route layer to
match the same convention keeps the boundary contract consistent and avoids
relying on downstream normalization.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* feat(canvas): expand MCP tool params into per-row labels on block tile

The MCP Tool block on the workflow canvas previously crammed every selected-
tool parameter into a stringified blob under the `Tool` row. Now, when a tool
is selected, the tile reads the cached `_toolSchema` and emits one labeled
SubBlockRow per parameter (matching the Exa block's per-param layout). Labels
reuse `formatParameterLabel` for parity with the editor panel; values pass
through the existing `getDisplayValue` so booleans/numbers/arrays render
identically to other blocks. Deterministic tile height counts expanded rows
so the tile sizes correctly.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* feat(logs): show MCP icon and strip prefix in trace tool spans

Tool spans for MCP calls were rendering the raw id (e.g.
`mcp-f908f259-planetscale_list_organizations`) with the default blank-
square icon. Now they read just the tool name and render the MCP block's
icon and bgColor, matching how workflow-execute tools render.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* fix(logs): lift near-black trace icon backgrounds for dark-mode contrast

Block bgColors below a small luminance threshold (e.g. the MCP block's
#181C1E) rendered nearly invisible against the dark-mode surface
(--bg: #1b1b1b). Adds a tiny adjustBgForContrast helper that floors each
RGB channel at 0x33 only when luminance is below 30,000, leaving every
branded color above that band untouched. Applied to both the trace tree
row and the detail pane.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* fix(logs): fall back to neutral gray for near-black trace icon bgs

#333333 was still too close to the dark-mode surface to read. For bgs
below the luminance threshold (e.g. the MCP block's #181C1E) we now fall
back to DEFAULT_BLOCK_COLOR (#6b7280) — the same neutral the renderer
uses for blocks with no distinct identity. Clearly visible in both
themes; brighter brand colors still pass through.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* chore(db): drop 0209_mcp_oauth migration ahead of staging merge

Staging shipped 0209_smiling_fixer; the MCP OAuth migration will be
regenerated on top of staging as 0210.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* chore(db): regenerate MCP OAuth migration as 0210

Re-runs drizzle-kit generate on top of staging's 0209_smiling_fixer.
Same schema (mcp_server_oauth table + mcp_servers.auth_type / oauth_*
columns) as the dropped 0209_mcp_oauth.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* chore(audit): bump route baseline 748 → 749 after staging merge

The post-merge route count is 749 (this branch's OAuth start/callback
plus staging's new route). I had set the baseline to 748 in the merge
conflict resolution — bumping to match reality so the strict audit
passes.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* chore: remove source-command skill files committed by accident

These were untracked-then-accidentally-staged in 05c4bc19e via a wide
`git add -A`. They aren't part of this PR's scope.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
---
 apps/sim/app/api/mcp/oauth/callback/route.ts  |   181 +
 .../sim/app/api/mcp/oauth/start/route.test.ts |   137 +
 apps/sim/app/api/mcp/oauth/start/route.ts     |   122 +
 apps/sim/app/api/mcp/servers/[id]/route.ts    |    29 +-
 apps/sim/app/api/mcp/servers/route.ts         |    23 +-
 apps/sim/app/api/mcp/tools/discover/route.ts  |    15 +-
 apps/sim/app/api/mcp/tools/execute/route.ts   |    52 +-
 .../components/trace-view/trace-view.tsx      |    30 +-
 .../logs/components/log-details/utils.ts      |    24 +-
 .../mcp/components/form-field/form-field.tsx  |     2 +-
 .../mcp-server-form-modal.tsx                 |   342 +-
 .../settings/components/mcp/mcp.tsx           |   398 +-
 .../components/tool-input/tool-input.tsx      |    12 +-
 .../workflow-block/workflow-block.tsx         |    54 +-
 apps/sim/hooks/mcp/use-mcp-oauth-popup.ts     |   132 +
 apps/sim/hooks/mcp/use-mcp-tools.ts           |    11 +-
 apps/sim/hooks/queries/mcp.ts                 |   164 +-
 apps/sim/lib/api/contracts/mcp.ts             |    77 +
 apps/sim/lib/core/utils/urls.ts               |    11 +-
 apps/sim/lib/mcp/client.test.ts               |    25 +-
 apps/sim/lib/mcp/client.ts                    |    19 +-
 apps/sim/lib/mcp/connection-manager.test.ts   |    65 +-
 apps/sim/lib/mcp/connection-manager.ts        |   131 +-
 apps/sim/lib/mcp/middleware.ts                |     2 +-
 apps/sim/lib/mcp/oauth/callback-reasons.ts    |    23 +
 apps/sim/lib/mcp/oauth/creds-diff.ts          |    39 +
 apps/sim/lib/mcp/oauth/index.ts               |    30 +
 apps/sim/lib/mcp/oauth/probe.ts               |    92 +
 apps/sim/lib/mcp/oauth/provider.ts            |   179 +
 apps/sim/lib/mcp/oauth/revoke.ts              |   104 +
 apps/sim/lib/mcp/oauth/storage.test.ts        |    94 +
 apps/sim/lib/mcp/oauth/storage.ts             |   249 +
 apps/sim/lib/mcp/oauth/url-validation.ts      |    25 +
 .../lib/mcp/orchestration/server-lifecycle.ts |   178 +-
 apps/sim/lib/mcp/service.ts                   |   141 +-
 apps/sim/lib/mcp/types.ts                     |    38 +
 apps/sim/lib/mcp/workflow-tool-schema.ts      |     4 +-
 packages/db/migrations/0210_mcp_oauth.sql     |    23 +
 .../db/migrations/meta/0210_snapshot.json     | 16596 ++++++++++++++++
 packages/db/migrations/meta/_journal.json     |     7 +
 packages/db/schema.ts                         |    62 +
 packages/testing/src/mocks/index.ts           |     7 +
 packages/testing/src/mocks/mcp-oauth.mock.ts  |    74 +
 packages/testing/src/mocks/schema.mock.ts     |    13 +
 scripts/check-api-validation-contracts.ts     |     8 +-
 45 files changed, 19496 insertions(+), 548 deletions(-)
 create mode 100644 apps/sim/app/api/mcp/oauth/callback/route.ts
 create mode 100644 apps/sim/app/api/mcp/oauth/start/route.test.ts
 create mode 100644 apps/sim/app/api/mcp/oauth/start/route.ts
 create mode 100644 apps/sim/hooks/mcp/use-mcp-oauth-popup.ts
 create mode 100644 apps/sim/lib/mcp/oauth/callback-reasons.ts
 create mode 100644 apps/sim/lib/mcp/oauth/creds-diff.ts
 create mode 100644 apps/sim/lib/mcp/oauth/index.ts
 create mode 100644 apps/sim/lib/mcp/oauth/probe.ts
 create mode 100644 apps/sim/lib/mcp/oauth/provider.ts
 create mode 100644 apps/sim/lib/mcp/oauth/revoke.ts
 create mode 100644 apps/sim/lib/mcp/oauth/storage.test.ts
 create mode 100644 apps/sim/lib/mcp/oauth/storage.ts
 create mode 100644 apps/sim/lib/mcp/oauth/url-validation.ts
 create mode 100644 packages/db/migrations/0210_mcp_oauth.sql
 create mode 100644 packages/db/migrations/meta/0210_snapshot.json
 create mode 100644 packages/testing/src/mocks/mcp-oauth.mock.ts

diff --git a/apps/sim/app/api/mcp/oauth/callback/route.ts b/apps/sim/app/api/mcp/oauth/callback/route.ts
new file mode 100644
index 00000000000..721675dac9d
--- /dev/null
+++ b/apps/sim/app/api/mcp/oauth/callback/route.ts
@@ -0,0 +1,181 @@
+import { auth as mcpAuth } from '@modelcontextprotocol/sdk/client/auth.js'
+import { db } from '@sim/db'
+import { mcpServers } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { and, eq, isNull } from 'drizzle-orm'
+import type { NextRequest } from 'next/server'
+import { NextResponse } from 'next/server'
+import { mcpOauthCallbackContract } from '@/lib/api/contracts/mcp'
+import { parseRequest } from '@/lib/api/server'
+import { getSession } from '@/lib/auth'
+import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
+import {
+  assertSafeOauthServerUrl,
+  clearState,
+  clearVerifier,
+  loadOauthRowByState,
+  loadPreregisteredClient,
+  type McpOauthCallbackReason,
+  SimMcpOauthProvider,
+} from '@/lib/mcp/oauth'
+import { mcpService } from '@/lib/mcp/service'
+
+const logger = createLogger('McpOauthCallbackAPI')
+
+export const dynamic = 'force-dynamic'
+
+function escapeHtml(value: string): string {
+  return value
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;')
+}
+
+function jsonLiteral(value: string | undefined): string {
+  if (value === undefined) return 'undefined'
+  return JSON.stringify(value).replace(/</g, '\\u003c').replace(/>/g, '\\u003e')
+}
+
+function htmlClose(
+  message: string,
+  ok: boolean,
+  reason: McpOauthCallbackReason,
+  serverId?: string
+): NextResponse {
+  const safeMessage = escapeHtml(message)
+  const title = ok ? 'Connected' : 'Connection failed'
+  const body = `<!doctype html><html><head><meta charset="utf-8"><title>${title}</title></head><body style="font-family: system-ui; padding: 24px"><p>${safeMessage}</p><script>
+    try { window.opener && window.opener.postMessage({ type: 'mcp-oauth', ok: ${ok ? 'true' : 'false'}, serverId: ${jsonLiteral(serverId)}, reason: ${jsonLiteral(reason)} }, window.location.origin) } catch (e) {}
+    setTimeout(function () { window.close() }, 800)
+  </script></body></html>`
+  return new NextResponse(body, {
+    headers: { 'Content-Type': 'text/html; charset=utf-8' },
+  })
+}
+
+export const GET = withRouteHandler(async (request: NextRequest) => {
+  const parsed = await parseRequest(mcpOauthCallbackContract, request, {})
+  if (!parsed.success) {
+    return htmlClose('Malformed authorization callback.', false, 'missing_params')
+  }
+  const { state, code, error: errorParam } = parsed.data.query
+
+  const initialRow = state ? await loadOauthRowByState(state).catch(() => null) : null
+  const stateRowServerId = initialRow?.mcpServerId
+
+  if (errorParam) {
+    logger.warn(`MCP OAuth callback received error: ${errorParam}`)
+    if (initialRow) await clearState(initialRow.id).catch(() => {})
+    return htmlClose(
+      `Authorization failed: ${errorParam}`,
+      false,
+      'provider_error',
+      stateRowServerId
+    )
+  }
+  if (!state || !code) {
+    return htmlClose(
+      'Missing state or code in callback URL.',
+      false,
+      'missing_params',
+      stateRowServerId
+    )
+  }
+
+  let serverId: string | undefined
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      return htmlClose(
+        'You must be signed in to complete authorization.',
+        false,
+        'unauthenticated',
+        stateRowServerId
+      )
+    }
+
+    const row = initialRow
+    if (!row) {
+      return htmlClose('Invalid or expired authorization state.', false, 'invalid_state')
+    }
+    serverId = row.mcpServerId
+
+    if (session.user.id !== row.userId) {
+      return htmlClose(
+        'You must be signed in as the same user that initiated the flow.',
+        false,
+        'user_mismatch',
+        serverId
+      )
+    }
+
+    const [server] = await db
+      .select({ id: mcpServers.id, url: mcpServers.url, workspaceId: mcpServers.workspaceId })
+      .from(mcpServers)
+      .where(and(eq(mcpServers.id, row.mcpServerId), isNull(mcpServers.deletedAt)))
+      .limit(1)
+    if (!server || !server.url) {
+      return htmlClose('Server no longer exists.', false, 'server_gone', serverId)
+    }
+    if (server.workspaceId !== row.workspaceId) {
+      return htmlClose(
+        'Workspace mismatch on authorization callback.',
+        false,
+        'invalid_state',
+        serverId
+      )
+    }
+    try {
+      assertSafeOauthServerUrl(server.url)
+    } catch {
+      return htmlClose(
+        'MCP OAuth requires https (or http://localhost for development).',
+        false,
+        'insecure_url',
+        serverId
+      )
+    }
+
+    // Burn state before token exchange so a replayed callback cannot reuse it.
+    await clearState(row.id)
+
+    const preregistered = await loadPreregisteredClient(server.id)
+    const provider = new SimMcpOauthProvider({ row, preregistered })
+    let result: Awaited<ReturnType<typeof mcpAuth>>
+    try {
+      result = await mcpAuth(provider, {
+        serverUrl: server.url,
+        authorizationCode: code,
+      })
+    } catch (e) {
+      logger.error('Token exchange failed during MCP OAuth callback', e)
+      return htmlClose(
+        'Token exchange failed. Please try again.',
+        false,
+        'token_exchange_failed',
+        server.id
+      )
+    } finally {
+      await clearVerifier(row.id)
+    }
+
+    if (result !== 'AUTHORIZED') {
+      return htmlClose('Authorization did not complete.', false, 'token_exchange_failed', server.id)
+    }
+
+    try {
+      await mcpService.clearCache(server.workspaceId)
+      await mcpService.discoverServerTools(session.user.id, server.id, server.workspaceId)
+    } catch (e) {
+      logger.warn('Post-auth tools refresh failed', toError(e).message)
+    }
+
+    return htmlClose('Connected. You can close this window.', true, 'authorized', server.id)
+  } catch (error) {
+    logger.error('MCP OAuth callback failed', error)
+    return htmlClose('Authorization failed. Please try again.', false, 'unknown', serverId)
+  }
+})
diff --git a/apps/sim/app/api/mcp/oauth/start/route.test.ts b/apps/sim/app/api/mcp/oauth/start/route.test.ts
new file mode 100644
index 00000000000..7c81138ca42
--- /dev/null
+++ b/apps/sim/app/api/mcp/oauth/start/route.test.ts
@@ -0,0 +1,137 @@
+/**
+ * @vitest-environment node
+ */
+import {
+  dbChainMock,
+  dbChainMockFns,
+  hybridAuthMock,
+  hybridAuthMockFns,
+  McpOauthRedirectRequiredMock,
+  mcpOauthMock,
+  mcpOauthMockFns,
+  permissionsMock,
+  permissionsMockFns,
+  resetDbChainMock,
+  schemaMock,
+} from '@sim/testing'
+import { NextRequest } from 'next/server'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockMcpAuth } = vi.hoisted(() => ({
+  mockMcpAuth: vi.fn(),
+}))
+
+vi.mock('@sim/db', () => dbChainMock)
+vi.mock('@sim/db/schema', () => schemaMock)
+vi.mock('drizzle-orm', () => ({
+  and: vi.fn(),
+  eq: vi.fn(),
+  isNull: vi.fn(),
+}))
+vi.mock('@modelcontextprotocol/sdk/client/auth.js', () => ({
+  auth: mockMcpAuth,
+}))
+vi.mock('@/lib/auth/hybrid', () => hybridAuthMock)
+vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock)
+vi.mock('@/lib/mcp/oauth', () => mcpOauthMock)
+
+import { GET } from './route'
+
+describe('MCP OAuth start route', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    resetDbChainMock()
+    hybridAuthMockFns.mockCheckSessionOrInternalAuth.mockResolvedValue({
+      success: true,
+      userId: 'user-2',
+      userName: 'User Two',
+      userEmail: 'user2@example.com',
+      authType: 'session',
+    })
+    permissionsMockFns.mockGetUserEntityPermissions.mockResolvedValue('write')
+    dbChainMockFns.limit.mockResolvedValue([
+      {
+        id: 'server-1',
+        name: 'Exa',
+        url: 'https://mcp.exa.ai/mcp',
+        workspaceId: 'workspace-1',
+        authType: 'oauth',
+        deletedAt: null,
+      },
+    ])
+    mcpOauthMockFns.mockGetOrCreateOauthRow.mockResolvedValue({
+      id: 'oauth-row-1',
+      mcpServerId: 'server-1',
+      userId: 'user-1',
+      workspaceId: 'workspace-1',
+      clientInformation: null,
+      tokens: null,
+      codeVerifier: null,
+      state: null,
+      stateCreatedAt: null,
+      updatedAt: new Date(),
+    })
+    mcpOauthMockFns.mockLoadPreregisteredClient.mockResolvedValue(undefined)
+    mockMcpAuth.mockRejectedValue(new McpOauthRedirectRequiredMock('https://mcp.exa.ai/authorize'))
+  })
+
+  it('requires workspace write permission via MCP auth middleware', async () => {
+    const request = new NextRequest(
+      'http://localhost:3000/api/mcp/oauth/start?workspaceId=workspace-1&serverId=server-1'
+    )
+
+    await GET(request)
+
+    expect(permissionsMockFns.mockGetUserEntityPermissions).toHaveBeenCalledWith(
+      'user-2',
+      'workspace',
+      'workspace-1'
+    )
+  })
+
+  it('uses a workspace-scoped OAuth row and stamps the latest authorizing user', async () => {
+    const request = new NextRequest(
+      'http://localhost:3000/api/mcp/oauth/start?workspaceId=workspace-1&serverId=server-1'
+    )
+
+    const response = await GET(request)
+    const body = await response.json()
+
+    expect(response.status).toBe(200)
+    expect(body).toEqual({
+      status: 'redirect',
+      authorizationUrl: 'https://mcp.exa.ai/authorize',
+    })
+    expect(mcpOauthMockFns.mockGetOrCreateOauthRow).toHaveBeenCalledWith({
+      mcpServerId: 'server-1',
+      userId: 'user-2',
+      workspaceId: 'workspace-1',
+    })
+    expect(mcpOauthMockFns.mockSetOauthRowUser).toHaveBeenCalledWith('oauth-row-1', 'user-2')
+  })
+
+  it('rejects a second user starting OAuth while another authorization is active', async () => {
+    mcpOauthMockFns.mockGetOrCreateOauthRow.mockResolvedValueOnce({
+      id: 'oauth-row-1',
+      mcpServerId: 'server-1',
+      userId: 'user-1',
+      workspaceId: 'workspace-1',
+      clientInformation: null,
+      tokens: null,
+      codeVerifier: null,
+      state: 'hashed-active-state',
+      stateCreatedAt: new Date(),
+      updatedAt: new Date(),
+    })
+    const request = new NextRequest(
+      'http://localhost:3000/api/mcp/oauth/start?workspaceId=workspace-1&serverId=server-1'
+    )
+
+    const response = await GET(request)
+    const body = await response.json()
+
+    expect(response.status).toBe(409)
+    expect(body.error).toBe('OAuth authorization already in progress for this server')
+    expect(mockMcpAuth).not.toHaveBeenCalled()
+  })
+})
diff --git a/apps/sim/app/api/mcp/oauth/start/route.ts b/apps/sim/app/api/mcp/oauth/start/route.ts
new file mode 100644
index 00000000000..55a7d41956f
--- /dev/null
+++ b/apps/sim/app/api/mcp/oauth/start/route.ts
@@ -0,0 +1,122 @@
+import { auth as mcpAuth } from '@modelcontextprotocol/sdk/client/auth.js'
+import { db } from '@sim/db'
+import { mcpServers } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { and, eq, isNull } from 'drizzle-orm'
+import type { NextRequest } from 'next/server'
+import { NextResponse } from 'next/server'
+import { startMcpOauthContract } from '@/lib/api/contracts/mcp'
+import { parseRequest } from '@/lib/api/server'
+import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
+import { withMcpAuth } from '@/lib/mcp/middleware'
+import {
+  assertSafeOauthServerUrl,
+  getOrCreateOauthRow,
+  loadPreregisteredClient,
+  McpOauthInsecureUrlError,
+  McpOauthRedirectRequired,
+  SimMcpOauthProvider,
+  setOauthRowUser,
+} from '@/lib/mcp/oauth'
+import { createMcpErrorResponse } from '@/lib/mcp/utils'
+
+const logger = createLogger('McpOauthStartAPI')
+const OAUTH_START_TTL_MS = 10 * 60 * 1000
+
+export const dynamic = 'force-dynamic'
+
+export const GET = withRouteHandler(
+  withMcpAuth('write')(async (request: NextRequest, { userId, workspaceId }) => {
+    try {
+      const parsed = await parseRequest(startMcpOauthContract, request, {})
+      if (!parsed.success) return parsed.response
+      const { serverId } = parsed.data.query
+
+      const [server] = await db
+        .select()
+        .from(mcpServers)
+        .where(
+          and(
+            eq(mcpServers.id, serverId),
+            eq(mcpServers.workspaceId, workspaceId),
+            isNull(mcpServers.deletedAt)
+          )
+        )
+        .limit(1)
+
+      if (!server) {
+        return createMcpErrorResponse(new Error('Server not found'), 'Server not found', 404)
+      }
+      if (server.authType !== 'oauth') {
+        return createMcpErrorResponse(
+          new Error(`Server authType is "${server.authType}", not oauth`),
+          'Server is not configured for OAuth',
+          400
+        )
+      }
+      if (!server.url) {
+        return createMcpErrorResponse(new Error('Server has no URL'), 'Missing server URL', 400)
+      }
+      try {
+        assertSafeOauthServerUrl(server.url)
+      } catch (e) {
+        if (e instanceof McpOauthInsecureUrlError) {
+          return createMcpErrorResponse(
+            e,
+            'MCP OAuth requires https (or http://localhost for development)',
+            400
+          )
+        }
+        throw e
+      }
+
+      const row = await getOrCreateOauthRow({
+        mcpServerId: server.id,
+        userId,
+        workspaceId,
+      })
+      const hasActiveFlow =
+        !!row.state &&
+        !!row.stateCreatedAt &&
+        row.stateCreatedAt.getTime() > Date.now() - OAUTH_START_TTL_MS
+      if (hasActiveFlow && row.userId && row.userId !== userId) {
+        return createMcpErrorResponse(
+          new Error('OAuth authorization already in progress'),
+          'OAuth authorization already in progress for this server',
+          409
+        )
+      }
+      if (row.userId !== userId) {
+        await setOauthRowUser(row.id, userId)
+        row.userId = userId
+      }
+      const preregistered = await loadPreregisteredClient(server.id)
+      const provider = new SimMcpOauthProvider({ row, preregistered })
+
+      try {
+        const result = await mcpAuth(provider, { serverUrl: server.url })
+        if (result === 'AUTHORIZED') {
+          return NextResponse.json({ status: 'already_authorized' })
+        }
+        return createMcpErrorResponse(
+          new Error('Provider did not capture redirect URL'),
+          'Failed to start OAuth flow',
+          500
+        )
+      } catch (e) {
+        if (e instanceof McpOauthRedirectRequired) {
+          logger.info(`OAuth redirect for server ${serverId}`)
+          return NextResponse.json({
+            status: 'redirect',
+            authorizationUrl: e.authorizationUrl,
+          })
+        }
+        throw e
+      }
+    } catch (error) {
+      logger.error('Error starting MCP OAuth flow:', error)
+      return createMcpErrorResponse(toError(error), 'Failed to start OAuth flow', 500)
+    }
+  })
+)
diff --git a/apps/sim/app/api/mcp/servers/[id]/route.ts b/apps/sim/app/api/mcp/servers/[id]/route.ts
index 6795f6383e1..4242fdef119 100644
--- a/apps/sim/app/api/mcp/servers/[id]/route.ts
+++ b/apps/sim/app/api/mcp/servers/[id]/route.ts
@@ -45,23 +45,25 @@ export const PATCH = withRouteHandler(
           }
         )
 
-        // Remove workspaceId from body to prevent it from being updated
-        const { workspaceId: _, ...updateData } = body
-
         const result = await performUpdateMcpServer({
           workspaceId,
           userId,
           actorName: userName,
           actorEmail: userEmail,
           serverId,
-          name: updateData.name,
-          description: updateData.description,
-          transport: updateData.transport,
-          url: updateData.url,
-          headers: updateData.headers,
-          timeout: updateData.timeout,
-          retries: updateData.retries,
-          enabled: updateData.enabled,
+          name: body.name,
+          description: body.description,
+          transport: body.transport,
+          url: body.url,
+          headers: body.headers,
+          timeout: body.timeout,
+          retries: body.retries,
+          enabled: body.enabled,
+          authType: body.authType,
+          oauthClientId: body.oauthClientId || null,
+          oauthClientIdProvided: body.oauthClientId !== undefined,
+          oauthClientSecret: body.oauthClientSecret,
+          oauthClientSecretProvided: body.oauthClientSecret !== undefined,
           request,
         })
         if (!result.success || !result.server) {
@@ -75,7 +77,10 @@ export const PATCH = withRouteHandler(
 
         logger.info(`[${requestId}] Successfully updated MCP server: ${serverId}`)
 
-        return createMcpSuccessResponse({ server: updatedServer })
+        const { oauthClientSecret: _secret, ...rest } = updatedServer
+        return createMcpSuccessResponse({
+          server: { ...rest, hasOauthClientSecret: !!_secret },
+        })
       } catch (error) {
         logger.error(`[${requestId}] Error updating MCP server:`, error)
         return createMcpErrorResponse(toError(error), 'Failed to update MCP server', 500)
diff --git a/apps/sim/app/api/mcp/servers/route.ts b/apps/sim/app/api/mcp/servers/route.ts
index f0f2744b053..1d02caeef74 100644
--- a/apps/sim/app/api/mcp/servers/route.ts
+++ b/apps/sim/app/api/mcp/servers/route.ts
@@ -27,11 +27,16 @@ export const GET = withRouteHandler(
     try {
       logger.info(`[${requestId}] Listing MCP servers for workspace ${workspaceId}`)
 
-      const servers = await db
+      const rows = await db
         .select()
         .from(mcpServers)
         .where(and(eq(mcpServers.workspaceId, workspaceId), isNull(mcpServers.deletedAt)))
 
+      const servers = rows.map(({ oauthClientSecret: _secret, ...rest }) => ({
+        ...rest,
+        hasOauthClientSecret: !!_secret,
+      }))
+
       logger.info(
         `[${requestId}] Listed ${servers.length} MCP servers for workspace ${workspaceId}`
       )
@@ -45,13 +50,6 @@ export const GET = withRouteHandler(
 
 /**
  * POST - Register a new MCP server for the workspace (requires write permission)
- *
- * Uses deterministic server IDs based on URL hash to ensure that re-adding
- * the same server produces the same ID. This prevents "server not found" errors
- * when workflows reference the old server ID after delete/re-add cycles.
- *
- * If a server with the same ID already exists (same URL in same workspace),
- * it will be updated instead of creating a duplicate.
  */
 export const POST = withRouteHandler(
   withMcpAuth('write')(
@@ -96,6 +94,11 @@ export const POST = withRouteHandler(
           retries: body.retries,
           enabled: body.enabled,
           source,
+          authType: body.authType,
+          oauthClientId: body.oauthClientId || null,
+          oauthClientIdProvided: body.oauthClientId !== undefined,
+          oauthClientSecret: body.oauthClientSecret,
+          oauthClientSecretProvided: body.oauthClientSecret !== undefined,
           request,
         })
         if (!result.success || !result.serverId) {
@@ -112,8 +115,8 @@ export const POST = withRouteHandler(
 
         return createMcpSuccessResponse(
           result.updated
-            ? { serverId: result.serverId, updated: true }
-            : { serverId: result.serverId },
+            ? { serverId: result.serverId, updated: true, authType: result.authType }
+            : { serverId: result.serverId, authType: result.authType },
           result.updated ? 200 : 201
         )
       } catch (error) {
diff --git a/apps/sim/app/api/mcp/tools/discover/route.ts b/apps/sim/app/api/mcp/tools/discover/route.ts
index e94f2f56328..b125fa7ff2b 100644
--- a/apps/sim/app/api/mcp/tools/discover/route.ts
+++ b/apps/sim/app/api/mcp/tools/discover/route.ts
@@ -1,3 +1,4 @@
+import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js'
 import { createLogger } from '@sim/logger'
 import type { NextRequest } from 'next/server'
 import { mcpToolDiscoveryQuerySchema, refreshMcpToolsBodySchema } from '@/lib/api/contracts/mcp'
@@ -5,7 +6,7 @@ import { validationErrorResponse } from '@/lib/api/server'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { getParsedBody, withMcpAuth } from '@/lib/mcp/middleware'
 import { mcpService } from '@/lib/mcp/service'
-import type { McpToolDiscoveryResponse } from '@/lib/mcp/types'
+import { McpOauthAuthorizationRequiredError, type McpToolDiscoveryResponse } from '@/lib/mcp/types'
 import { categorizeError, createMcpErrorResponse, createMcpSuccessResponse } from '@/lib/mcp/utils'
 
 const logger = createLogger('McpToolDiscoveryAPI')
@@ -46,6 +47,12 @@ export const GET = withRouteHandler(
       )
       return createMcpSuccessResponse(responseData)
     } catch (error) {
+      if (
+        error instanceof McpOauthAuthorizationRequiredError ||
+        error instanceof UnauthorizedError
+      ) {
+        return createMcpErrorResponse(error, 'OAuth re-authorization required', 401)
+      }
       logger.error(`[${requestId}] Error discovering MCP tools:`, error)
       const { message, status } = categorizeError(error)
       return createMcpErrorResponse(new Error(message), 'Failed to discover MCP tools', status)
@@ -100,6 +107,12 @@ export const POST = withRouteHandler(
         },
       })
     } catch (error) {
+      if (
+        error instanceof McpOauthAuthorizationRequiredError ||
+        error instanceof UnauthorizedError
+      ) {
+        return createMcpErrorResponse(error, 'OAuth re-authorization required', 401)
+      }
       logger.error(`[${requestId}] Error refreshing tool discovery:`, error)
       const { message, status } = categorizeError(error)
       return createMcpErrorResponse(new Error(message), 'Failed to refresh tool discovery', status)
diff --git a/apps/sim/app/api/mcp/tools/execute/route.ts b/apps/sim/app/api/mcp/tools/execute/route.ts
index d9458deceab..8599a5fcadf 100644
--- a/apps/sim/app/api/mcp/tools/execute/route.ts
+++ b/apps/sim/app/api/mcp/tools/execute/route.ts
@@ -1,5 +1,7 @@
+import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js'
 import { createLogger } from '@sim/logger'
 import type { NextRequest } from 'next/server'
+import { NextResponse } from 'next/server'
 import { mcpToolExecutionBodySchema } from '@/lib/api/contracts/mcp'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/plan'
 import { getExecutionTimeout } from '@/lib/core/execution-limits'
@@ -7,8 +9,14 @@ import type { SubscriptionPlan } from '@/lib/core/rate-limiter/types'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { SIM_VIA_HEADER } from '@/lib/execution/call-chain'
 import { getParsedBody, withMcpAuth } from '@/lib/mcp/middleware'
+import { McpOauthRedirectRequired } from '@/lib/mcp/oauth'
 import { mcpService } from '@/lib/mcp/service'
-import type { McpTool, McpToolCall, McpToolResult } from '@/lib/mcp/types'
+import {
+  McpOauthAuthorizationRequiredError,
+  type McpTool,
+  type McpToolCall,
+  type McpToolResult,
+} from '@/lib/mcp/types'
 import { categorizeError, createMcpErrorResponse, createMcpSuccessResponse } from '@/lib/mcp/utils'
 import {
   assertPermissionsAllowed,
@@ -43,6 +51,7 @@ function hasType(prop: unknown): prop is SchemaProperty {
  */
 export const POST = withRouteHandler(
   withMcpAuth('read')(async (request: NextRequest, { userId, workspaceId, requestId }) => {
+    let serverId: string | undefined
     try {
       const rawBody = getParsedBody(request) ?? (await request.json())
       const parsedBody = mcpToolExecutionBodySchema.safeParse(rawBody)
@@ -63,7 +72,8 @@ export const POST = withRouteHandler(
         userId: userId,
       })
 
-      const { serverId, toolName, arguments: rawArgs } = body
+      const { toolName, arguments: rawArgs } = body
+      serverId = body.serverId
       const args = rawArgs || {}
 
       try {
@@ -101,7 +111,8 @@ export const POST = withRouteHandler(
 
         if (tool.inputSchema?.properties) {
           for (const [paramName, paramSchema] of Object.entries(tool.inputSchema.properties)) {
-            const schema = paramSchema as any
+            const schema = hasType(paramSchema) ? paramSchema : null
+            if (!schema) continue
             const value = args[paramName]
 
             if (value === undefined || value === null) {
@@ -185,12 +196,18 @@ export const POST = withRouteHandler(
         extraHeaders[SIM_VIA_HEADER] = simViaHeader
       }
 
+      let timeoutHandle: ReturnType<typeof setTimeout> | undefined
       const result = await Promise.race([
         mcpService.executeTool(userId, serverId, toolCall, workspaceId, extraHeaders),
-        new Promise<never>((_, reject) =>
-          setTimeout(() => reject(new Error('Tool execution timeout')), executionTimeout)
-        ),
-      ])
+        new Promise<never>((_, reject) => {
+          timeoutHandle = setTimeout(
+            () => reject(new Error('Tool execution timeout')),
+            executionTimeout
+          )
+        }),
+      ]).finally(() => {
+        if (timeoutHandle !== undefined) clearTimeout(timeoutHandle)
+      })
 
       const transformedResult = transformToolResult(result)
 
@@ -218,6 +235,27 @@ export const POST = withRouteHandler(
 
       return createMcpSuccessResponse(transformedResult)
     } catch (error) {
+      if (
+        error instanceof McpOauthAuthorizationRequiredError ||
+        error instanceof McpOauthRedirectRequired ||
+        error instanceof UnauthorizedError
+      ) {
+        const errorServerId =
+          error instanceof McpOauthAuthorizationRequiredError ? error.serverId : serverId
+        logger.warn(`[${requestId}] OAuth re-authorization required for MCP tool execution`, {
+          serverId: errorServerId,
+        })
+        return NextResponse.json(
+          {
+            success: false,
+            error: 'OAuth re-authorization required',
+            code: 'reauth_required',
+            serverId: errorServerId,
+          },
+          { status: 401 }
+        )
+      }
+
       logger.error(`[${requestId}] Error executing MCP tool:`, error)
 
       const { message, status } = categorizeError(error)
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/trace-view/trace-view.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/trace-view/trace-view.tsx
index 4bda12945a5..07a3cf78181 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/trace-view/trace-view.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/trace-view/trace-view.tsx
@@ -32,6 +32,7 @@ import {
 import { cn } from '@/lib/core/utils/cn'
 import type { TraceSpan } from '@/lib/logs/types'
 import {
+  DEFAULT_BLOCK_COLOR,
   formatCostAmount,
   formatTokenCount,
   formatTps,
@@ -120,6 +121,21 @@ function iconColorClass(bgColor: string): string {
   return r * 299 + g * 587 + b * 114 > 160_000 ? 'text-[#111111]' : 'text-white'
 }
 
+/**
+ * Near-black bgColors disappear against the dark-mode surface (--bg: #1b1b1b).
+ * Below the luminance threshold we fall back to the neutral block color used
+ * for blocks with no distinct identity; everything brighter passes through.
+ */
+function adjustBgForContrast(bgColor: string): string {
+  const hex = bgColor.replace('#', '')
+  if (hex.length !== 6) return bgColor
+  const r = Number.parseInt(hex.slice(0, 2), 16)
+  const g = Number.parseInt(hex.slice(2, 4), 16)
+  const b = Number.parseInt(hex.slice(4, 6), 16)
+  if (r * 299 + g * 587 + b * 114 < 30_000) return DEFAULT_BLOCK_COLOR
+  return bgColor
+}
+
 /**
  * Flattens the visible (expanded) span tree into a linear list for keyboard
  * navigation, carrying depth, the chain of parent ids for indent drawing, and
@@ -268,7 +284,12 @@ const TraceTreeRow = memo(function TraceTreeRow({
   const duration = span.duration || endMs - startMs
   const isRootWorkflow = depth === 0 && span.type?.toLowerCase() === 'workflow'
   const hasError = isRootWorkflow ? hasUnhandledErrorInTree(span) : hasErrorInTree(span)
-  const { icon: BlockIcon, bgColor } = getBlockIconAndColor(span.type, span.name, span.provider)
+  const { icon: BlockIcon, bgColor: rawBgColor } = getBlockIconAndColor(
+    span.type,
+    span.name,
+    span.provider
+  )
+  const bgColor = adjustBgForContrast(rawBgColor)
   const nameMatches = !!matchQuery && spanMatchesQuery(span, matchQuery)
 
   const offsetMs = runStartMs > 0 ? Math.max(0, startMs - runStartMs) : 0
@@ -651,7 +672,12 @@ const TraceDetailPane = memo(function TraceDetailPane({ span }: { span: TraceSpa
   }
 
   const duration = span.duration || parseTime(span.endTime) - parseTime(span.startTime)
-  const { icon: BlockIcon, bgColor } = getBlockIconAndColor(span.type, span.name, span.provider)
+  const { icon: BlockIcon, bgColor: rawBgColor } = getBlockIconAndColor(
+    span.type,
+    span.name,
+    span.provider
+  )
+  const bgColor = adjustBgForContrast(rawBgColor)
   const isRootWorkflow = span.type?.toLowerCase() === 'workflow'
   const hasError = isRootWorkflow ? hasUnhandledErrorInTree(span) : hasErrorInTree(span)
   const isDirectError = span.status === 'error'
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/utils.ts b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/utils.ts
index afdf52bdaab..4f142b0c67d 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/utils.ts
@@ -8,6 +8,20 @@ import { getBlock, getBlockByToolName } from '@/blocks'
 import { PROVIDER_DEFINITIONS } from '@/providers/models'
 import { normalizeToolId } from '@/tools/normalize'
 
+/**
+ * Extracts the bare tool name from an MCP tool id of the form
+ * `mcp-{serverId}-{toolName}`. Returns null when the id is not MCP-shaped.
+ * Kept local to avoid importing from `@/lib/mcp/utils`, which pulls in
+ * `next/server` and breaks client bundles.
+ */
+function tryParseMcpToolName(toolId: string): string | null {
+  if (!toolId.startsWith('mcp-')) return null
+  const parts = toolId.split('-')
+  if (parts.length < 3) return null
+  const toolName = parts.slice(2).join('-')
+  return toolName.length > 0 ? toolName : null
+}
+
 export const DEFAULT_BLOCK_COLOR = '#6b7280'
 
 export interface BlockIconAndColor {
@@ -41,6 +55,10 @@ export function getBlockIconAndColor(
 ): BlockIconAndColor {
   const lowerType = type.toLowerCase()
   if (lowerType === 'tool' && toolName) {
+    if (tryParseMcpToolName(toolName)) {
+      const mcpBlock = getBlock('mcp')
+      if (mcpBlock) return { icon: mcpBlock.icon, bgColor: mcpBlock.bgColor }
+    }
     const normalized = normalizeToolId(toolName)
     if (normalized === 'load_skill') return { icon: AgentSkillsIcon, bgColor: '#8B5CF6' }
     const toolBlock = getBlockByToolName(normalized)
@@ -90,7 +108,11 @@ export function formatTps(
 }
 
 export function getDisplayName(span: TraceSpan): string {
-  if (span.type?.toLowerCase() === 'tool') return normalizeToolId(span.name)
+  if (span.type?.toLowerCase() === 'tool') {
+    const mcpToolName = tryParseMcpToolName(span.name)
+    if (mcpToolName) return mcpToolName
+    return normalizeToolId(span.name)
+  }
   return span.name
 }
 
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/form-field/form-field.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/form-field/form-field.tsx
index 04beeb1484a..cad5381d1d2 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/form-field/form-field.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/form-field/form-field.tsx
@@ -9,7 +9,7 @@ interface FormFieldProps {
 export function FormField({ label, children, optional }: FormFieldProps) {
   return (
     <div className='flex items-center justify-between gap-3'>
-      <Label className='w-[100px] shrink-0 font-medium text-[var(--text-secondary)] text-sm'>
+      <Label className='w-[116px] shrink-0 font-medium text-[var(--text-secondary)] text-sm'>
         {label}
         {optional && (
           <span className='ml-1 font-normal text-[var(--text-muted)] text-xs'>(optional)</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx
index 79209191d46..c4a27748a45 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx
@@ -1,8 +1,9 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
+import { ChevronDown, ChevronRight } from 'lucide-react'
 import {
   Button,
   Input as EmcnInput,
@@ -12,6 +13,7 @@ import {
   ModalDescription,
   ModalFooter,
   ModalHeader,
+  SecretInput,
   Textarea,
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
@@ -37,6 +39,9 @@ interface McpServerFormData {
   url?: string
   timeout?: number
   headers?: HeaderEntry[]
+  oauthClientId?: string
+  oauthClientSecret?: string
+  hasOauthClientSecret?: boolean
 }
 
 export interface McpServerFormConfig {
@@ -45,6 +50,8 @@ export interface McpServerFormConfig {
   url: string
   headers: Record<string, string>
   timeout: number
+  oauthClientId?: string
+  oauthClientSecret?: string
 }
 
 export interface McpServerFormModalProps {
@@ -324,6 +331,9 @@ export function McpServerFormModal({
   const [urlScrollLeft, setUrlScrollLeft] = useState(0)
   const [headerScrollLeft, setHeaderScrollLeft] = useState<Record<string, number>>({})
 
+  const [showAdvanced, setShowAdvanced] = useState(false)
+  const [oauthClientSecretTouched, setOauthClientSecretTouched] = useState(false)
+
   const [prevOpen, setPrevOpen] = useState(false)
   if (open && !prevOpen) {
     const data = initialData ?? DEFAULT_FORM_DATA
@@ -339,6 +349,8 @@ export function McpServerFormModal({
     setActiveHeaderIndex(null)
     setUrlScrollLeft(0)
     setHeaderScrollLeft({})
+    setShowAdvanced(!!(data.oauthClientId || data.oauthClientSecret || data.hasOauthClientSecret))
+    setOauthClientSecretTouched(false)
   }
   if (open !== prevOpen) {
     setPrevOpen(open)
@@ -352,76 +364,72 @@ export function McpServerFormModal({
     }
   }, [open, clearTestResult])
 
-  const resetEnvVarState = useCallback(() => {
+  const resetEnvVarState = () => {
     setShowEnvVars(false)
     setActiveInputField(null)
     setActiveHeaderIndex(null)
-  }, [])
-
-  const handleInputChange = useCallback(
-    (field: InputFieldType, value: string, headerIndex?: number) => {
-      const input = document.activeElement as HTMLInputElement
-      const pos = input?.selectionStart || 0
-      setCursorPosition(pos)
-
-      if (testResult) clearTestResult()
-      if (submitError) setSubmitError(null)
-
-      const envVarTrigger = checkEnvVarTrigger(value, pos)
-      setShowEnvVars(envVarTrigger.show)
-      setEnvSearchTerm(envVarTrigger.show ? envVarTrigger.searchTerm : '')
-
-      if (envVarTrigger.show) {
-        setActiveInputField(field)
-        setActiveHeaderIndex(headerIndex ?? null)
-      } else {
-        resetEnvVarState()
-      }
+  }
 
-      if (field === 'url') {
-        setFormData((prev) => ({ ...prev, url: value }))
-      } else if (headerIndex !== undefined) {
-        const headerField = field === 'header-key' ? 'key' : 'value'
-        setFormData((prev) => ({
-          ...prev,
-          headers: updateHeadersArray(prev.headers || [], headerIndex, headerField, value),
-        }))
-      }
-    },
-    [testResult, clearTestResult, submitError, resetEnvVarState]
-  )
+  const handleInputChange = (field: InputFieldType, value: string, headerIndex?: number) => {
+    const input = document.activeElement as HTMLInputElement
+    const pos = input?.selectionStart || 0
+    setCursorPosition(pos)
 
-  const handleEnvVarSelect = useCallback(
-    (newValue: string) => {
-      if (activeInputField === 'url') {
-        setFormData((prev) => ({ ...prev, url: newValue }))
-      } else if (activeHeaderIndex !== null) {
-        const field = activeInputField === 'header-key' ? 'key' : 'value'
-        const processedValue = field === 'key' ? newValue.replace(/[{}]/g, '') : newValue
-        setFormData((prev) => ({
-          ...prev,
-          headers: updateHeadersArray(prev.headers || [], activeHeaderIndex, field, processedValue),
-        }))
-      }
+    if (testResult) clearTestResult()
+    if (submitError) setSubmitError(null)
+
+    const envVarTrigger = checkEnvVarTrigger(value, pos)
+    setShowEnvVars(envVarTrigger.show)
+    setEnvSearchTerm(envVarTrigger.show ? envVarTrigger.searchTerm : '')
+
+    if (envVarTrigger.show) {
+      setActiveInputField(field)
+      setActiveHeaderIndex(headerIndex ?? null)
+    } else {
       resetEnvVarState()
-    },
-    [activeInputField, activeHeaderIndex, resetEnvVarState]
-  )
+    }
+
+    if (field === 'url') {
+      setFormData((prev) => ({ ...prev, url: value }))
+    } else if (headerIndex !== undefined) {
+      const headerField = field === 'header-key' ? 'key' : 'value'
+      setFormData((prev) => ({
+        ...prev,
+        headers: updateHeadersArray(prev.headers || [], headerIndex, headerField, value),
+      }))
+    }
+  }
 
-  const handleHeaderScroll = useCallback((key: string, sl: number) => {
+  const handleEnvVarSelect = (newValue: string) => {
+    if (activeInputField === 'url') {
+      setFormData((prev) => ({ ...prev, url: newValue }))
+    } else if (activeHeaderIndex !== null) {
+      const field = activeInputField === 'header-key' ? 'key' : 'value'
+      const processedValue = field === 'key' ? newValue.replace(/[{}]/g, '') : newValue
+      setFormData((prev) => ({
+        ...prev,
+        headers: updateHeadersArray(prev.headers || [], activeHeaderIndex, field, processedValue),
+      }))
+    }
+    resetEnvVarState()
+  }
+
+  const handleHeaderScroll = (key: string, sl: number) => {
     setHeaderScrollLeft((prev) => ({ ...prev, [key]: sl }))
-  }, [])
+  }
 
   const isDomainBlocked =
     !!formData.url?.trim() && !isDomainAllowed(formData.url, allowedMcpDomains)
   const isFormValid = !!(formData.name.trim() && formData.url?.trim())
   const testButtonLabel = getTestButtonLabel(testResult, isTestingConnection)
 
-  const hasChanges = useMemo(() => {
+  const computeHasChanges = (): boolean => {
     if (mode === 'add') return true
     if (formData.name !== originalData.name) return true
     if (formData.url !== originalData.url) return true
     if (formData.transport !== originalData.transport) return true
+    if ((formData.oauthClientId || '') !== (originalData.oauthClientId || '')) return true
+    if (oauthClientSecretTouched) return true
     const currentHeaders = formData.headers || []
     const origHeaders = originalData.headers || []
     if (currentHeaders.length !== origHeaders.length) return true
@@ -433,49 +441,49 @@ export function McpServerFormModal({
         return true
     }
     return false
-  }, [mode, formData, originalData])
-
-  const parseJsonConfig = useCallback(
-    (json: string): { name: string; url: string; headers: Record<string, string> } | null => {
-      try {
-        const parsed = JSON.parse(json)
-
-        if (parsed.mcpServers && typeof parsed.mcpServers === 'object') {
-          const entries = Object.entries(parsed.mcpServers)
-          if (entries.length === 0) {
-            setJsonError('No servers found in mcpServers')
-            return null
-          }
-          if (entries.length > 1) {
-            setJsonError(
-              `Only the first server ("${entries[0][0]}") will be imported. Paste each config separately to add others.`
-            )
-          }
-          const [name, config] = entries[0] as [string, Record<string, unknown>]
-          if (!config.url || typeof config.url !== 'string') {
-            setJsonError('Server config must include a "url" field')
-            return null
-          }
-          if (entries.length <= 1) setJsonError(null)
-          return { name, url: config.url, headers: extractStringHeaders(config.headers) }
-        }
+  }
+  const hasChanges = computeHasChanges()
 
-        if (parsed.url && typeof parsed.url === 'string') {
-          setJsonError(null)
-          return { name: '', url: parsed.url, headers: extractStringHeaders(parsed.headers) }
+  const parseJsonConfig = (
+    json: string
+  ): { name: string; url: string; headers: Record<string, string> } | null => {
+    try {
+      const parsed = JSON.parse(json)
+
+      if (parsed.mcpServers && typeof parsed.mcpServers === 'object') {
+        const entries = Object.entries(parsed.mcpServers)
+        if (entries.length === 0) {
+          setJsonError('No servers found in mcpServers')
+          return null
+        }
+        if (entries.length > 1) {
+          setJsonError(
+            `Only the first server ("${entries[0][0]}") will be imported. Paste each config separately to add others.`
+          )
         }
+        const [name, config] = entries[0] as [string, Record<string, unknown>]
+        if (!config.url || typeof config.url !== 'string') {
+          setJsonError('Server config must include a "url" field')
+          return null
+        }
+        if (entries.length <= 1) setJsonError(null)
+        return { name, url: config.url, headers: extractStringHeaders(config.headers) }
+      }
 
-        setJsonError('JSON must contain "mcpServers" or a "url" field')
-        return null
-      } catch {
-        setJsonError('Invalid JSON')
-        return null
+      if (parsed.url && typeof parsed.url === 'string') {
+        setJsonError(null)
+        return { name: '', url: parsed.url, headers: extractStringHeaders(parsed.headers) }
       }
-    },
-    []
-  )
 
-  const handleTestConnection = useCallback(async () => {
+      setJsonError('JSON must contain "mcpServers" or a "url" field')
+      return null
+    } catch {
+      setJsonError('Invalid JSON')
+      return null
+    }
+  }
+
+  const handleTestConnection = async () => {
     if (!isFormValid) return
 
     await testConnection({
@@ -486,15 +494,20 @@ export function McpServerFormModal({
       timeout: formData.timeout,
       workspaceId,
     })
-  }, [formData, isFormValid, testConnection, workspaceId])
+  }
 
-  const handleSubmitForm = useCallback(async () => {
+  const handleSubmitForm = async () => {
     if (!isFormValid || isDomainBlocked) return
 
     setIsSubmitting(true)
     setSubmitError(null)
     try {
       const headers = headersToRecord(formData.headers)
+      const oauthClientId = formData.oauthClientId?.trim()
+      const oauthClientSecret = formData.oauthClientSecret?.trim()
+      const originalClientId = (originalData.oauthClientId || '').trim()
+      const oauthClientIdChanged = (oauthClientId || '') !== originalClientId
+
       const connectionResult = await testConnection({
         name: formData.name,
         transport: formData.transport,
@@ -505,10 +518,18 @@ export function McpServerFormModal({
       })
 
       if (!connectionResult.success) {
-        setSubmitError(
-          connectionResult.error || 'Connection test failed. Please check the URL and try again.'
-        )
-        return
+        const errorText = (connectionResult.error || '').toLowerCase()
+        const looksLikeAuthRequired =
+          /\b401\b/.test(errorText) ||
+          errorText.includes('unauthorized') ||
+          errorText.includes('oauth') ||
+          errorText.includes('authentication')
+        if (!looksLikeAuthRequired) {
+          setSubmitError(
+            connectionResult.error || 'Connection test failed. Please check the URL and try again.'
+          )
+          return
+        }
       }
 
       await onSubmit({
@@ -517,19 +538,30 @@ export function McpServerFormModal({
         url: formData.url!,
         headers,
         timeout: formData.timeout || 30000,
+        oauthClientId:
+          mode === 'edit'
+            ? oauthClientIdChanged
+              ? (oauthClientId ?? '')
+              : undefined
+            : oauthClientId || undefined,
+        oauthClientSecret:
+          mode === 'edit'
+            ? oauthClientSecretTouched
+              ? (oauthClientSecret ?? '')
+              : undefined
+            : oauthClientSecret || undefined,
       })
 
       onOpenChange(false)
     } catch (error) {
-      const message = getErrorMessage(error, 'Failed to save server')
-      setSubmitError(message)
+      setSubmitError(getErrorMessage(error, 'Failed to save server'))
       logger.error('Failed to save MCP server:', error)
     } finally {
       setIsSubmitting(false)
     }
-  }, [formData, isFormValid, isDomainBlocked, testConnection, workspaceId, onSubmit, onOpenChange])
+  }
 
-  const handleSubmitJson = useCallback(async () => {
+  const handleSubmitJson = async () => {
     const config = parseJsonConfig(jsonInput)
     if (!config) return
 
@@ -572,21 +604,12 @@ export function McpServerFormModal({
 
       onOpenChange(false)
     } catch (error) {
-      const message = getErrorMessage(error, 'Failed to save server')
-      setSubmitError(message)
+      setSubmitError(getErrorMessage(error, 'Failed to save server'))
       logger.error('Failed to save MCP server from JSON:', error)
     } finally {
       setIsSubmitting(false)
     }
-  }, [
-    jsonInput,
-    parseJsonConfig,
-    allowedMcpDomains,
-    testConnection,
-    workspaceId,
-    onSubmit,
-    onOpenChange,
-  ])
+  }
 
   const isSubmitDisabled =
     isSubmitting || !isFormValid || isDomainBlocked || (mode === 'edit' && !hasChanges)
@@ -596,9 +619,9 @@ export function McpServerFormModal({
 
   return (
     <Modal open={open} onOpenChange={onOpenChange}>
-      <ModalContent>
-        <ModalHeader>{title}</ModalHeader>
-        <ModalBody>
+      <ModalContent size='lg' className='max-h-[82vh]'>
+        <ModalHeader className='border-[var(--border)] border-b pb-3'>{title}</ModalHeader>
+        <ModalBody className='min-h-0 px-4 pt-4 pb-4'>
           <ModalDescription className='sr-only'>
             Configure an MCP server by entering the server URL and optional headers, or paste a JSON
             configuration.
@@ -614,12 +637,28 @@ export function McpServerFormModal({
                   if (testResult) clearTestResult()
                   if (submitError) setSubmitError(null)
                 }}
-                className='min-h-[200px] font-mono text-small'
+                className='min-h-[280px] font-mono text-small leading-5'
               />
               {jsonError && <p className='text-[var(--text-error)] text-caption'>{jsonError}</p>}
             </div>
           ) : (
-            <div className='flex flex-col gap-2'>
+            <div className='flex flex-col gap-3'>
+              <input
+                type='text'
+                name='fakeusernameremembered'
+                autoComplete='username'
+                style={{ position: 'absolute', left: '-9999px', opacity: 0, pointerEvents: 'none' }}
+                tabIndex={-1}
+                readOnly
+              />
+              <input
+                type='password'
+                name='fakepasswordremembered'
+                autoComplete='current-password'
+                style={{ position: 'absolute', left: '-9999px', opacity: 0, pointerEvents: 'none' }}
+                tabIndex={-1}
+                readOnly
+              />
               <FormField label='Server Name'>
                 <EmcnInput
                   placeholder='e.g., My MCP Server'
@@ -658,8 +697,7 @@ export function McpServerFormModal({
                 )}
               </FormField>
 
-              <div className='flex flex-col gap-2'>
-                <span className='font-medium text-[var(--text-secondary)] text-small'>Headers</span>
+              <FormField label='Headers'>
                 <div className='flex max-h-[140px] flex-col gap-2 overflow-y-auto'>
                   {(formData.headers || []).map((header, index) => (
                     <HeaderRow
@@ -681,13 +719,71 @@ export function McpServerFormModal({
                     />
                   ))}
                 </div>
-              </div>
+              </FormField>
+
+              <Button
+                type='button'
+                variant='ghost'
+                onClick={() => setShowAdvanced((v) => !v)}
+                className='mt-1 gap-1 self-start px-0 py-0 text-small'
+              >
+                {showAdvanced ? (
+                  <ChevronDown className='size-[14px]' />
+                ) : (
+                  <ChevronRight className='size-[14px]' />
+                )}
+                Advanced settings
+              </Button>
+              {showAdvanced && (
+                <div className='flex flex-col gap-2'>
+                  <FormField label='Client ID'>
+                    <EmcnInput
+                      placeholder='OAuth Client ID (optional)'
+                      value={formData.oauthClientId || ''}
+                      name='mcp_oauth_client_id'
+                      autoComplete='off'
+                      autoCorrect='off'
+                      autoCapitalize='off'
+                      data-lpignore='true'
+                      data-form-type='other'
+                      onChange={(e) => {
+                        if (testResult) clearTestResult()
+                        if (submitError) setSubmitError(null)
+                        setFormData((prev) => ({ ...prev, oauthClientId: e.target.value }))
+                      }}
+                      className='h-9'
+                    />
+                  </FormField>
+                  <FormField label='Client Secret'>
+                    <SecretInput
+                      placeholder='OAuth Client Secret (optional)'
+                      value={formData.oauthClientSecret || ''}
+                      name='mcp_oauth_client_secret'
+                      autoComplete='new-password'
+                      autoCorrect='off'
+                      autoCapitalize='off'
+                      data-lpignore='true'
+                      data-form-type='other'
+                      onChange={(value) => {
+                        if (testResult) clearTestResult()
+                        if (submitError) setSubmitError(null)
+                        setOauthClientSecretTouched(value.length > 0)
+                        setFormData((prev) => ({ ...prev, oauthClientSecret: value }))
+                      }}
+                      className='h-9'
+                    />
+                  </FormField>
+                  <p className='text-[var(--text-tertiary)] text-caption'>
+                    Only needed for servers that don't support automatic client registration.
+                  </p>
+                </div>
+              )}
             </div>
           )}
         </ModalBody>
-        <ModalFooter>
+        <ModalFooter className='flex-col items-stretch gap-2'>
           {submitError && (
-            <p className='mb-2 w-full text-[var(--text-error)] text-small'>{submitError}</p>
+            <p className='w-full text-[var(--text-error)] text-small'>{submitError}</p>
           )}
           <div className='flex w-full items-center justify-between'>
             <div className='flex items-center gap-2'>
@@ -716,7 +812,7 @@ export function McpServerFormModal({
               )}
             </div>
             <div className='flex items-center gap-2'>
-              <Button variant='ghost' onClick={() => onOpenChange(false)}>
+              <Button variant='default' onClick={() => onOpenChange(false)}>
                 Cancel
               </Button>
               {formMode === 'json' ? (
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/mcp.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/mcp.tsx
index a21da0f563e..e8bc927a284 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/mcp.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/mcp.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { ChevronDown, Plus, Search } from 'lucide-react'
@@ -27,6 +27,7 @@ import {
   type McpToolIssue,
 } from '@/lib/mcp/tool-validation'
 import type { McpTransport } from '@/lib/mcp/types'
+import { useMcpOauthPopup } from '@/hooks/mcp/use-mcp-oauth-popup'
 import {
   type McpServer,
   type McpTool,
@@ -102,7 +103,10 @@ function ServerListItem({
           <span className='text-[var(--text-secondary)] text-sm'>({transportLabel})</span>
         </div>
         <p
-          className={`truncate text-sm ${isError ? 'text-red-500 dark:text-red-400' : 'text-[var(--text-muted)]'}`}
+          className={cn(
+            'truncate text-sm',
+            isError ? 'text-[var(--text-error)]' : 'text-[var(--text-muted)]'
+          )}
         >
           {isRefreshing
             ? 'Refreshing...'
@@ -123,14 +127,29 @@ function ServerListItem({
   )
 }
 
+function buildEditInitialData(server: McpServer) {
+  const entries: { key: string; value: string }[] = server.headers
+    ? Object.entries(server.headers).map(([key, value]) => ({ key, value }))
+    : []
+  if (entries.length === 0) entries.push({ key: '', value: '' })
+  const last = entries[entries.length - 1]
+  if (last.key !== '' || last.value !== '') entries.push({ key: '', value: '' })
+
+  return {
+    name: server.name || '',
+    transport: (server.transport as McpTransport) || 'streamable-http',
+    url: server.url || '',
+    timeout: 30000,
+    headers: entries,
+    oauthClientId: server.oauthClientId || undefined,
+    hasOauthClientSecret: server.hasOauthClientSecret === true,
+  }
+}
+
 interface MCPProps {
   initialServerId?: string | null
 }
 
-/**
- * MCP Settings component for managing Model Context Protocol servers.
- * Handles server CRUD operations, connection testing, and environment variable integration.
- */
 export function MCP({ initialServerId }: MCPProps) {
   const params = useParams()
   const workspaceId = params.workspaceId as string
@@ -147,7 +166,8 @@ export function MCP({ initialServerId }: MCPProps) {
     isFetching: toolsFetching,
   } = useMcpToolsQuery(workspaceId)
   const { data: storedTools = [], refetch: refetchStoredTools } = useStoredMcpTools(workspaceId)
-  const forceRefreshTools = useForceRefreshMcpTools()
+  const forceRefreshToolsMutation = useForceRefreshMcpTools()
+  const forceRefreshTools = forceRefreshToolsMutation.mutate
   const createServerMutation = useCreateMcpServer()
   const deleteServerMutation = useDeleteMcpServer()
   const refreshServerMutation = useRefreshMcpServer()
@@ -156,23 +176,16 @@ export function MCP({ initialServerId }: MCPProps) {
   const { data: allowedMcpDomains = null } = useAllowedMcpDomains()
 
   const [showAddModal, setShowAddModal] = useState(false)
-  const [showEditModal, setShowEditModal] = useState(false)
-  const [editInitialData, setEditInitialData] = useState<
-    | {
-        name: string
-        transport: McpTransport
-        url?: string
-        timeout?: number
-        headers?: { key: string; value: string }[]
-      }
-    | undefined
-  >(undefined)
+  const [editingServerId, setEditingServerId] = useState<string | null>(null)
 
   const [searchTerm, setSearchTerm] = useState('')
   const [deletingServers, setDeletingServers] = useState<Set<string>>(() => new Set())
+  const { connectingServers: connectingOauthServers, startOauthForServer } = useMcpOauthPopup({
+    workspaceId,
+  })
 
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false)
-  const [serverToDelete, setServerToDelete] = useState<{ id: string; name: string } | null>(null)
+  const [serverToDeleteId, setServerToDeleteId] = useState<string | null>(null)
+  const showDeleteDialog = serverToDeleteId !== null
 
   const [selectedServerId, setSelectedServerId] = useState<string | null>(initialServerId ?? null)
 
@@ -185,28 +198,23 @@ export function MCP({ initialServerId }: MCPProps) {
     }
   }, [])
 
-  const [refreshingServers, setRefreshingServers] = useState<
-    Record<string, { status: 'refreshing' | 'refreshed'; workflowsUpdated?: number }>
-  >({})
   const [expandedTools, setExpandedTools] = useState<Set<string>>(() => new Set())
 
-  const handleRemoveServer = useCallback((serverId: string, serverName: string) => {
-    setServerToDelete({ id: serverId, name: serverName })
-    setShowDeleteDialog(true)
-  }, [])
+  const handleRemoveServer = (serverId: string) => {
+    setServerToDeleteId(serverId)
+  }
 
-  const confirmDeleteServer = useCallback(async () => {
-    if (!serverToDelete) return
+  const confirmDeleteServer = async () => {
+    if (!serverToDeleteId) return
 
-    setShowDeleteDialog(false)
-    const { id: serverId, name: serverName } = serverToDelete
-    setServerToDelete(null)
+    const serverId = serverToDeleteId
+    setServerToDeleteId(null)
 
     setDeletingServers((prev) => new Set(prev).add(serverId))
 
     try {
       await deleteServerMutation.mutateAsync({ workspaceId, serverId })
-      logger.info(`Removed MCP server: ${serverName}`)
+      logger.info(`Removed MCP server: ${serverId}`)
     } catch (error) {
       logger.error('Failed to remove MCP server:', error)
     } finally {
@@ -216,43 +224,36 @@ export function MCP({ initialServerId }: MCPProps) {
         return newSet
       })
     }
-  }, [serverToDelete, deleteServerMutation, workspaceId])
-
-  const toolsByServer = useMemo(() => {
-    return (mcpToolsData || []).reduce(
-      (acc, tool) => {
-        if (!tool?.serverId) return acc
-        if (!acc[tool.serverId]) {
-          acc[tool.serverId] = []
-        }
-        acc[tool.serverId].push(tool)
-        return acc
-      },
-      {} as Record<string, typeof mcpToolsData>
-    )
-  }, [mcpToolsData])
-
-  const filteredServers = useMemo(() => {
-    return (servers || []).filter((server) =>
-      server.name?.toLowerCase().includes(searchTerm.toLowerCase())
-    )
-  }, [servers, searchTerm])
+  }
 
-  const handleViewDetails = useCallback(
-    (serverId: string) => {
-      setSelectedServerId(serverId)
-      forceRefreshTools(workspaceId)
-      refetchStoredTools()
+  const toolsByServer = (mcpToolsData || []).reduce(
+    (acc, tool) => {
+      if (!tool?.serverId) return acc
+      if (!acc[tool.serverId]) {
+        acc[tool.serverId] = []
+      }
+      acc[tool.serverId].push(tool)
+      return acc
     },
-    [workspaceId, forceRefreshTools, refetchStoredTools]
+    {} as Record<string, typeof mcpToolsData>
+  )
+
+  const filteredServers = (servers || []).filter((server) =>
+    server.name?.toLowerCase().includes(searchTerm.toLowerCase())
   )
 
-  const handleBackToList = useCallback(() => {
+  const handleViewDetails = (serverId: string) => {
+    setSelectedServerId(serverId)
+    forceRefreshTools(workspaceId)
+    refetchStoredTools()
+  }
+
+  const handleBackToList = () => {
     setSelectedServerId(null)
     setExpandedTools(new Set())
-  }, [])
+  }
 
-  const toggleToolExpanded = useCallback((toolName: string) => {
+  const toggleToolExpanded = (toolName: string) => {
     setExpandedTools((prev) => {
       const newSet = new Set(prev)
       if (newSet.has(toolName)) {
@@ -262,131 +263,109 @@ export function MCP({ initialServerId }: MCPProps) {
       }
       return newSet
     })
-  }, [])
+  }
 
-  const handleRefreshServer = useCallback(
-    async (serverId: string) => {
-      try {
-        setRefreshingServers((prev) => ({ ...prev, [serverId]: { status: 'refreshing' } }))
-        const result = await refreshServerMutation.mutateAsync({ workspaceId, serverId })
-        logger.info(
-          `Refreshed MCP server: ${serverId}, workflows updated: ${result.workflowsUpdated}`
-        )
-
-        const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-        if (activeWorkflowId && result.updatedWorkflowIds?.includes(activeWorkflowId)) {
-          logger.info(`Active workflow ${activeWorkflowId} was updated, reloading subblock values`)
-          try {
-            const { data: workflowData } = await requestJson(getWorkflowStateContract, {
-              params: { id: activeWorkflowId },
-            })
-            if (workflowData?.state?.blocks) {
-              useSubBlockStore
-                .getState()
-                .initializeFromWorkflow(
-                  activeWorkflowId,
-                  workflowData.state.blocks as Record<string, BlockState>
-                )
-            }
-          } catch (reloadError) {
-            logger.warn('Failed to reload workflow subblock values:', reloadError)
-          }
-        }
+  const handleRefreshServer = async (serverId: string) => {
+    try {
+      const result = await refreshServerMutation.mutateAsync({ workspaceId, serverId })
+      logger.info(
+        `Refreshed MCP server: ${serverId}, workflows updated: ${result.workflowsUpdated}`
+      )
 
-        setRefreshingServers((prev) => ({
-          ...prev,
-          [serverId]: { status: 'refreshed', workflowsUpdated: result.workflowsUpdated },
-        }))
-        setTimeout(() => {
-          setRefreshingServers((prev) => {
-            const newState = { ...prev }
-            delete newState[serverId]
-            return newState
+      const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
+      if (activeWorkflowId && result.updatedWorkflowIds?.includes(activeWorkflowId)) {
+        logger.info(`Active workflow ${activeWorkflowId} was updated, reloading subblock values`)
+        try {
+          const { data: workflowData } = await requestJson(getWorkflowStateContract, {
+            params: { id: activeWorkflowId },
           })
-        }, 3000)
-      } catch (error) {
-        logger.error('Failed to refresh MCP server:', error)
-        setRefreshingServers((prev) => {
-          const newState = { ...prev }
-          delete newState[serverId]
-          return newState
-        })
+          if (workflowData?.state?.blocks) {
+            useSubBlockStore
+              .getState()
+              .initializeFromWorkflow(
+                activeWorkflowId,
+                workflowData.state.blocks as Record<string, BlockState>
+              )
+          }
+        } catch (reloadError) {
+          logger.warn('Failed to reload workflow subblock values:', reloadError)
+        }
       }
-    },
-    [refreshServerMutation, workspaceId]
-  )
-
-  const handleOpenEditModal = useCallback((server: McpServer) => {
-    const headers: { key: string; value: string }[] = server.headers
-      ? Object.entries(server.headers).map(([key, value]) => ({ key, value }))
-      : [{ key: '', value: '' }]
-    if (headers.length === 0) headers.push({ key: '', value: '' })
-
-    const lastHeader = headers[headers.length - 1]
-    if (lastHeader.key !== '' || lastHeader.value !== '') {
-      headers.push({ key: '', value: '' })
+    } catch (error) {
+      logger.error('Failed to refresh MCP server:', error)
     }
+  }
 
-    setEditInitialData({
-      name: server.name || '',
-      transport: (server.transport as McpTransport) || 'streamable-http',
-      url: server.url || '',
-      timeout: 30000,
-      headers,
-    })
-    setShowEditModal(true)
-  }, [])
-
-  const selectedServer = useMemo(() => {
+  useEffect(() => {
+    if (!refreshServerMutation.isSuccess) return
+    const timeout = window.setTimeout(() => refreshServerMutation.reset(), 3000)
+    return () => window.clearTimeout(timeout)
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- mutation object is unstable; isSuccess flag is the trigger
+  }, [refreshServerMutation.isSuccess])
+
+  const refreshingServerId = refreshServerMutation.isPending
+    ? refreshServerMutation.variables?.serverId
+    : null
+  const refreshedServerId = refreshServerMutation.isSuccess
+    ? refreshServerMutation.variables?.serverId
+    : null
+  const refreshedWorkflowsUpdated = refreshServerMutation.data?.workflowsUpdated
+
+  const editingServer = editingServerId
+    ? (servers.find((s) => s.id === editingServerId) as McpServer | undefined)
+    : undefined
+  const editInitialData = editingServer ? buildEditInitialData(editingServer) : undefined
+
+  const selectedServer = (() => {
     if (!selectedServerId) return null
     const server = servers.find((s) => s.id === selectedServerId) as McpServer | undefined
     if (!server) return null
     const serverTools = (toolsByServer[selectedServerId] || []) as McpTool[]
     return { server, tools: serverTools }
-  }, [selectedServerId, servers, toolsByServer])
+  })()
+
+  const getStoredToolIssues = (
+    serverId: string,
+    toolName: string
+  ): { issue: McpToolIssue; workflowName: string }[] => {
+    const relevantStoredTools = storedTools.filter(
+      (st) => st.serverId === serverId && st.toolName === toolName
+    )
 
-  const getStoredToolIssues = useCallback(
-    (serverId: string, toolName: string): { issue: McpToolIssue; workflowName: string }[] => {
-      const relevantStoredTools = storedTools.filter(
-        (st) => st.serverId === serverId && st.toolName === toolName
+    const serverStates = servers.map((s) => ({
+      id: s.id,
+      url: s.url,
+      connectionStatus: s.connectionStatus,
+      lastError: s.lastError || undefined,
+    }))
+
+    const discoveredTools = mcpToolsData.map((t) => ({
+      serverId: t.serverId,
+      name: t.name,
+      inputSchema: t.inputSchema,
+    }))
+
+    const issues: { issue: McpToolIssue; workflowName: string }[] = []
+
+    for (const storedTool of relevantStoredTools) {
+      const issue = getMcpToolIssue(
+        {
+          serverId: storedTool.serverId,
+          serverUrl: storedTool.serverUrl,
+          toolName: storedTool.toolName,
+          schema: storedTool.schema,
+        },
+        serverStates,
+        discoveredTools
       )
 
-      const serverStates = servers.map((s) => ({
-        id: s.id,
-        url: s.url,
-        connectionStatus: s.connectionStatus,
-        lastError: s.lastError || undefined,
-      }))
-
-      const discoveredTools = mcpToolsData.map((t) => ({
-        serverId: t.serverId,
-        name: t.name,
-        inputSchema: t.inputSchema,
-      }))
-
-      const issues: { issue: McpToolIssue; workflowName: string }[] = []
-
-      for (const storedTool of relevantStoredTools) {
-        const issue = getMcpToolIssue(
-          {
-            serverId: storedTool.serverId,
-            serverUrl: storedTool.serverUrl,
-            toolName: storedTool.toolName,
-            schema: storedTool.schema,
-          },
-          serverStates,
-          discoveredTools
-        )
-
-        if (issue) {
-          issues.push({ issue, workflowName: storedTool.workflowName })
-        }
+      if (issue) {
+        issues.push({ issue, workflowName: storedTool.workflowName })
       }
+    }
 
-      return issues
-    },
-    [storedTools, servers, mcpToolsData]
-  )
+    return issues
+  }
 
   const error = toolsError || serversError
   const hasServers = servers && servers.length > 0
@@ -422,12 +401,32 @@ export function MCP({ initialServerId }: MCPProps) {
             {server.connectionStatus === 'error' && (
               <div className='flex flex-col gap-2'>
                 <span className='font-medium text-[var(--text-primary)] text-sm'>Status</span>
-                <p className='text-base text-red-500 dark:text-red-400'>
+                <p className='text-[var(--text-error)] text-base'>
                   {server.lastError || 'Unable to connect'}
                 </p>
               </div>
             )}
 
+            {server.authType === 'oauth' && server.connectionStatus !== 'connected' && (
+              <div className='flex flex-col gap-2'>
+                <span className='font-medium text-[var(--text-primary)] text-sm'>
+                  Authentication
+                </span>
+                <div>
+                  <Button
+                    variant='primary'
+                    size='sm'
+                    disabled={connectingOauthServers.has(server.id)}
+                    onClick={async () => {
+                      await startOauthForServer(server.id)
+                    }}
+                  >
+                    {connectingOauthServers.has(server.id) ? 'Connecting…' : 'Connect with OAuth'}
+                  </Button>
+                </div>
+              </div>
+            )}
+
             <div className='flex flex-col gap-2'>
               <span className='font-medium text-[var(--text-primary)] text-sm'>
                 Tools ({tools.length})
@@ -450,11 +449,12 @@ export function MCP({ initialServerId }: MCPProps) {
                         key={tool.name}
                         className='overflow-hidden rounded-md border bg-[var(--surface-3)]'
                       >
-                        <button
+                        <Button
                           type='button'
+                          variant='ghost'
                           onClick={() => hasParams && toggleToolExpanded(tool.name)}
                           className={cn(
-                            'flex w-full items-start justify-between px-2.5 py-2 text-left',
+                            'flex h-auto w-full items-start justify-between rounded-none px-2.5 py-2 text-left text-sm',
                             hasParams && 'cursor-pointer hover-hover:bg-[var(--surface-4)]'
                           )}
                           disabled={!hasParams}
@@ -491,12 +491,12 @@ export function MCP({ initialServerId }: MCPProps) {
                           {hasParams && (
                             <ChevronDown
                               className={cn(
-                                'mt-0.5 h-[14px] w-[14px] flex-shrink-0 text-[var(--text-muted)] transition-transform duration-200',
+                                'mt-0.5 size-[14px] flex-shrink-0 text-[var(--text-muted)] transition-transform duration-200',
                                 isExpanded && 'rotate-180'
                               )}
                             />
                           )}
-                        </button>
+                        </Button>
 
                         {isExpanded && hasParams && (
                           <div className='border-[var(--border-1)] border-t bg-[var(--surface-2)] px-2.5 py-2'>
@@ -563,25 +563,27 @@ export function MCP({ initialServerId }: MCPProps) {
             <Button
               onClick={() => handleRefreshServer(server.id)}
               variant='default'
-              disabled={!!refreshingServers[server.id]}
+              disabled={refreshingServerId === server.id || refreshedServerId === server.id}
             >
-              {refreshingServers[server.id]?.status === 'refreshing'
+              {refreshingServerId === server.id
                 ? 'Refreshing...'
-                : refreshingServers[server.id]?.status === 'refreshed'
-                  ? refreshingServers[server.id].workflowsUpdated
-                    ? `Synced (${refreshingServers[server.id].workflowsUpdated} workflow${refreshingServers[server.id].workflowsUpdated === 1 ? '' : 's'})`
+                : refreshedServerId === server.id
+                  ? refreshedWorkflowsUpdated
+                    ? `Synced (${refreshedWorkflowsUpdated} workflow${refreshedWorkflowsUpdated === 1 ? '' : 's'})`
                     : 'Refreshed'
                   : 'Refresh Tools'}
             </Button>
-            <Button onClick={() => handleOpenEditModal(server)} variant='default'>
+            <Button onClick={() => setEditingServerId(server.id)} variant='default'>
               Edit
             </Button>
           </div>
         </div>
 
         <McpServerFormModal
-          open={showEditModal}
-          onOpenChange={setShowEditModal}
+          open={editingServerId !== null}
+          onOpenChange={(open) => {
+            if (!open) setEditingServerId(null)
+          }}
           mode='edit'
           initialData={editInitialData}
           onSubmit={async (config) => {
@@ -620,7 +622,7 @@ export function MCP({ initialServerId }: MCPProps) {
             />
           </div>
           <Button onClick={() => setShowAddModal(true)} variant='primary' disabled={serversLoading}>
-            <Plus className='mr-1.5 size-[13px]' />
+            <Plus className='mr-1.5 size-[14px]' />
             Add
           </Button>
         </div>
@@ -628,7 +630,7 @@ export function MCP({ initialServerId }: MCPProps) {
         <div className='min-h-0 flex-1 overflow-y-auto'>
           {error ? (
             <div className='flex h-full flex-col items-center justify-center gap-2'>
-              <p className='text-[var(--error)] text-xs leading-tight dark:text-[var(--error)]'>
+              <p className='text-[var(--text-error)] text-xs leading-tight'>
                 {getErrorMessage(error, 'Failed to load MCP servers')}
               </p>
             </div>
@@ -656,8 +658,8 @@ export function MCP({ initialServerId }: MCPProps) {
                     tools={tools}
                     isDeleting={deletingServers.has(server.id)}
                     isLoadingTools={isLoadingTools}
-                    isRefreshing={refreshingServers[server.id]?.status === 'refreshing'}
-                    onRemove={() => handleRemoveServer(server.id, server.name || 'this server')}
+                    isRefreshing={refreshingServerId === server.id}
+                    onRemove={() => handleRemoveServer(server.id)}
                     onViewDetails={() => handleViewDetails(server.id)}
                   />
                 )
@@ -677,28 +679,38 @@ export function MCP({ initialServerId }: MCPProps) {
         onOpenChange={setShowAddModal}
         mode='add'
         onSubmit={async (config) => {
-          await createServerMutation.mutateAsync({
+          const result = await createServerMutation.mutateAsync({
             workspaceId,
             config: { ...config, enabled: true },
           })
+          if (result.authType === 'oauth') {
+            await startOauthForServer(result.serverId)
+          }
         }}
         workspaceId={workspaceId}
         availableEnvVars={availableEnvVars}
         allowedMcpDomains={allowedMcpDomains}
       />
 
-      <Modal open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+      <Modal
+        open={showDeleteDialog}
+        onOpenChange={(open) => {
+          if (!open) setServerToDeleteId(null)
+        }}
+      >
         <ModalContent size='sm'>
           <ModalHeader>Delete MCP Server</ModalHeader>
           <ModalBody>
             <ModalDescription className='text-[var(--text-secondary)]'>
               Are you sure you want to delete{' '}
-              <span className='font-medium text-[var(--text-primary)]'>{serverToDelete?.name}</span>
+              <span className='font-medium text-[var(--text-primary)]'>
+                {servers.find((s) => s.id === serverToDeleteId)?.name || 'this server'}
+              </span>
               ? This action cannot be undone.
             </ModalDescription>
           </ModalBody>
           <ModalFooter>
-            <Button variant='default' onClick={() => setShowDeleteDialog(false)}>
+            <Button variant='default' onClick={() => setServerToDeleteId(null)}>
               Cancel
             </Button>
             <Button variant='destructive' onClick={confirmDeleteServer}>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
index 1fa4255a6f1..b22ab920949 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -51,6 +51,7 @@ import type { WandControlHandlers } from '@/app/workspace/[workspaceId]/w/[workf
 import { getAllBlocks } from '@/blocks'
 import type { SubBlockConfig as BlockSubBlockConfig } from '@/blocks/types'
 import { BUILT_IN_TOOL_TYPES } from '@/blocks/utils'
+import { useMcpOauthPopup } from '@/hooks/mcp/use-mcp-oauth-popup'
 import { useMcpTools } from '@/hooks/mcp/use-mcp-tools'
 import { useWorkspaceCredential } from '@/hooks/queries/credentials'
 import {
@@ -514,10 +515,11 @@ export const ToolInput = memo(function ToolInput({
 
   const { data: mcpServers = [], isLoading: mcpServersLoading } = useMcpServers(workspaceId)
   const { data: storedMcpTools = [] } = useStoredMcpTools(workspaceId)
-  const forceRefreshMcpTools = useForceRefreshMcpTools()
+  const forceRefreshMcpTools = useForceRefreshMcpTools().mutate
   useMcpToolsEvents(workspaceId)
   const { navigateToSettings } = useSettingsNavigation()
   const createMcpServer = useCreateMcpServer()
+  const { startOauthForServer } = useMcpOauthPopup({ workspaceId })
   const { data: allowedMcpDomains = null } = useAllowedMcpDomains()
   const availableEnvVars = useAvailableEnvVarKeys(workspaceId)
   const mcpDataLoading = mcpLoading || mcpServersLoading
@@ -2114,7 +2116,13 @@ export const ToolInput = memo(function ToolInput({
         onOpenChange={setMcpModalOpen}
         mode='add'
         onSubmit={async (config) => {
-          await createMcpServer.mutateAsync({ workspaceId, config: { ...config, enabled: true } })
+          const result = await createMcpServer.mutateAsync({
+            workspaceId,
+            config: { ...config, enabled: true },
+          })
+          if (result.authType === 'oauth') {
+            await startOauthForServer(result.serverId)
+          }
         }}
         workspaceId={workspaceId}
         availableEnvVars={availableEnvVars}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
index 979af8479ae..ea2dc8ee21b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
@@ -56,6 +56,7 @@ import { useVariablesStore } from '@/stores/variables/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import { wouldCreateCycle } from '@/stores/workflows/workflow/utils'
+import { formatParameterLabel } from '@/tools/params'
 
 const logger = createLogger('WorkflowBlock')
 
@@ -1136,6 +1137,28 @@ export const WorkflowBlock = memo(function WorkflowBlock({
     return getRouterRows(id, topologySubBlocks.routes?.value)
   }, [type, topologySubBlocks, id])
 
+  /**
+   * Total rendered row count. `mcp-dynamic-args` expands one row per parameter
+   * in the cached tool schema, so we count those properties instead of 1.
+   */
+  const totalRenderedRowCount = useMemo(() => {
+    let count = 0
+    for (const row of subBlockRows) {
+      for (const subBlock of row) {
+        if (subBlock.type === 'mcp-dynamic-args') {
+          const schema = subBlockState._toolSchema?.value as
+            | { properties?: Record<string, unknown> }
+            | undefined
+          const properties = schema?.properties
+          count += properties && typeof properties === 'object' ? Object.keys(properties).length : 0
+        } else {
+          count += 1
+        }
+      }
+    }
+    return count
+  }, [subBlockRows, subBlockState])
+
   /**
    * Compute and publish deterministic layout metrics for workflow blocks.
    * This avoids ResizeObserver/animation-frame jitter and prevents initial "jump".
@@ -1147,7 +1170,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
         blockType: type,
         category: config.category,
         displayTriggerMode,
-        visibleSubBlockCount: subBlockRows.reduce((acc, row) => acc + row.length, 0),
+        visibleSubBlockCount: totalRenderedRowCount,
         conditionRowCount: conditionRows.length,
         routerRowCount: routerRows.length,
       })
@@ -1156,7 +1179,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
       type,
       config.category,
       displayTriggerMode,
-      subBlockRows.reduce((acc, row) => acc + row.length, 0),
+      totalRenderedRowCount,
       conditionRows.length,
       routerRows.length,
       horizontalHandles,
@@ -1378,9 +1401,28 @@ export const WorkflowBlock = memo(function WorkflowBlock({
               </>
             ) : (
               subBlockRows.map((row, rowIndex) =>
-                row.map((subBlock) => {
+                row.flatMap((subBlock) => {
                   const rawValue = subBlockState[subBlock.id]?.value
-                  return (
+                  if (subBlock.type === 'mcp-dynamic-args') {
+                    const schema = subBlockState._toolSchema?.value as
+                      | { properties?: Record<string, unknown> }
+                      | undefined
+                    const properties = schema?.properties
+                    if (properties && typeof properties === 'object') {
+                      const args = (
+                        rawValue && typeof rawValue === 'object' ? rawValue : {}
+                      ) as Record<string, unknown>
+                      return Object.keys(properties).map((paramName) => (
+                        <SubBlockRow
+                          key={`${subBlock.id}-${paramName}-${rowIndex}`}
+                          title={formatParameterLabel(paramName)}
+                          value={getDisplayValue(args[paramName])}
+                        />
+                      ))
+                    }
+                    return []
+                  }
+                  return [
                     <SubBlockRow
                       key={`${subBlock.id}-${rowIndex}`}
                       title={subBlock.title ?? subBlock.id}
@@ -1394,8 +1436,8 @@ export const WorkflowBlock = memo(function WorkflowBlock({
                       displayAdvancedOptions={effectiveAdvanced}
                       canonicalIndex={canonicalIndex}
                       canonicalModeOverrides={canonicalModeOverrides}
-                    />
-                  )
+                    />,
+                  ]
                 })
               )
             )}
diff --git a/apps/sim/hooks/mcp/use-mcp-oauth-popup.ts b/apps/sim/hooks/mcp/use-mcp-oauth-popup.ts
new file mode 100644
index 00000000000..0df50e49a72
--- /dev/null
+++ b/apps/sim/hooks/mcp/use-mcp-oauth-popup.ts
@@ -0,0 +1,132 @@
+'use client'
+
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { useQueryClient } from '@tanstack/react-query'
+import { toast } from '@/components/emcn'
+import type { McpOauthCallbackMessage, McpOauthCallbackReason } from '@/lib/mcp/oauth'
+import { mcpKeys, useStartMcpOauth } from '@/hooks/queries/mcp'
+
+const logger = createLogger('useMcpOauthPopup')
+
+function reasonToMessage(reason: McpOauthCallbackReason | undefined): string {
+  switch (reason) {
+    case 'provider_error':
+      return 'The authorization server returned an error. Please try again.'
+    case 'invalid_state':
+      return 'Authorization expired. Please try again.'
+    case 'user_mismatch':
+      return 'You must complete authorization as the same user who started it.'
+    case 'server_gone':
+      return 'This MCP server no longer exists.'
+    case 'insecure_url':
+      return 'MCP OAuth requires https.'
+    case 'token_exchange_failed':
+      return 'Failed to complete token exchange with the authorization server.'
+    case 'unauthenticated':
+      return 'Please sign in and try again.'
+    case 'missing_params':
+      return 'The authorization callback was missing required parameters.'
+    default:
+      return 'Authorization failed. Please try again.'
+  }
+}
+
+interface UseMcpOauthPopupProps {
+  workspaceId: string
+}
+
+export function useMcpOauthPopup({ workspaceId }: UseMcpOauthPopupProps) {
+  const queryClient = useQueryClient()
+  const { mutateAsync: startOauth } = useStartMcpOauth()
+
+  const [connectingServers, setConnectingServers] = useState<Set<string>>(() => new Set())
+  const popupIntervalsRef = useRef<Map<string, number>>(new Map())
+
+  useEffect(() => {
+    const intervals = popupIntervalsRef.current
+    return () => {
+      for (const id of intervals.values()) window.clearInterval(id)
+      intervals.clear()
+    }
+  }, [])
+
+  useEffect(() => {
+    function onMessage(event: MessageEvent) {
+      if (event.origin !== window.location.origin) return
+      const data = event.data as Partial<McpOauthCallbackMessage> | null
+      if (data?.type !== 'mcp-oauth') return
+      if (data.serverId) {
+        const serverId = data.serverId
+        const interval = popupIntervalsRef.current.get(serverId)
+        if (interval !== undefined) {
+          window.clearInterval(interval)
+          popupIntervalsRef.current.delete(serverId)
+        }
+        setConnectingServers((prev) => {
+          if (!prev.has(serverId)) return prev
+          const next = new Set(prev)
+          next.delete(serverId)
+          return next
+        })
+      } else if (!data.ok) {
+        // Early callback failures (missing params, invalid state) post back
+        // without a serverId, so we can't target a specific row — clear all
+        // in-flight popups instead of leaving the UI stuck on "Connecting…".
+        for (const id of popupIntervalsRef.current.values()) window.clearInterval(id)
+        popupIntervalsRef.current.clear()
+        setConnectingServers((prev) => (prev.size === 0 ? prev : new Set()))
+      }
+      if (data.ok) {
+        queryClient.invalidateQueries({ queryKey: mcpKeys.serversList(workspaceId) })
+        queryClient.invalidateQueries({ queryKey: mcpKeys.toolsList(workspaceId) })
+        queryClient.invalidateQueries({ queryKey: mcpKeys.storedToolsList(workspaceId) })
+        toast.success('Server authorized')
+      } else {
+        toast.error(reasonToMessage(data.reason))
+      }
+    }
+    window.addEventListener('message', onMessage)
+    return () => window.removeEventListener('message', onMessage)
+  }, [queryClient, workspaceId])
+
+  const startOauthForServer = useCallback(
+    async (serverId: string) => {
+      setConnectingServers((prev) => new Set(prev).add(serverId))
+      const clear = () => {
+        const existing = popupIntervalsRef.current.get(serverId)
+        if (existing !== undefined) {
+          window.clearInterval(existing)
+          popupIntervalsRef.current.delete(serverId)
+        }
+        setConnectingServers((prev) => {
+          const next = new Set(prev)
+          next.delete(serverId)
+          return next
+        })
+      }
+      try {
+        const result = await startOauth({ serverId, workspaceId })
+        if (result.status === 'already_authorized') {
+          clear()
+          return
+        }
+        const { popup } = result
+        const existing = popupIntervalsRef.current.get(serverId)
+        if (existing !== undefined) window.clearInterval(existing)
+        const interval = window.setInterval(() => {
+          if (popup.closed) clear()
+        }, 500)
+        popupIntervalsRef.current.set(serverId, interval)
+      } catch (e) {
+        clear()
+        logger.error('Failed to start MCP OAuth', e)
+        toast.error(toError(e).message || 'Failed to start authorization')
+      }
+    },
+    [startOauth, workspaceId]
+  )
+
+  return { connectingServers, startOauthForServer }
+}
diff --git a/apps/sim/hooks/mcp/use-mcp-tools.ts b/apps/sim/hooks/mcp/use-mcp-tools.ts
index 4cca11e5b08..631387e039d 100644
--- a/apps/sim/hooks/mcp/use-mcp-tools.ts
+++ b/apps/sim/hooks/mcp/use-mcp-tools.ts
@@ -5,26 +5,27 @@
  * using TanStack Query for optimal caching and performance
  */
 
-import type React from 'react'
+import type { ComponentType, SVGProps } from 'react'
 import { useCallback, useMemo } from 'react'
 import { createLogger } from '@sim/logger'
 import { useQueryClient } from '@tanstack/react-query'
 import { McpIcon } from '@/components/icons'
 import { createMcpToolId } from '@/lib/mcp/shared'
+import type { McpToolSchema } from '@/lib/mcp/types'
 import { mcpKeys, useMcpToolsQuery } from '@/hooks/queries/mcp'
 
 const logger = createLogger('useMcpTools')
 
-interface McpToolForUI {
+export interface McpToolForUI {
   id: string
   name: string
   description?: string
   serverId: string
   serverName: string
   type: 'mcp'
-  inputSchema: any
+  inputSchema: McpToolSchema
   bgColor: string
-  icon: React.ComponentType<any>
+  icon: ComponentType<SVGProps<SVGSVGElement>>
 }
 
 export interface UseMcpToolsResult {
@@ -64,7 +65,7 @@ export function useMcpTools(workspaceId: string): UseMcpToolsResult {
       logger.info('Refreshing MCP tools', { forceRefresh, workspaceId })
 
       await queryClient.invalidateQueries({
-        queryKey: mcpKeys.tools(workspaceId),
+        queryKey: mcpKeys.toolsList(workspaceId),
         refetchType: forceRefresh ? 'active' : 'all',
       })
     },
diff --git a/apps/sim/hooks/queries/mcp.ts b/apps/sim/hooks/queries/mcp.ts
index 5601952d2b5..1e583ae5d41 100644
--- a/apps/sim/hooks/queries/mcp.ts
+++ b/apps/sim/hooks/queries/mcp.ts
@@ -16,22 +16,27 @@ import {
   type McpServerTestResult,
   type RefreshMcpServerResult,
   refreshMcpServerContract,
+  startMcpOauthContract,
   testMcpServerConnectionContract,
   updateMcpServerContract,
 } from '@/lib/api/contracts/mcp'
+import { isLoopbackHostname } from '@/lib/core/utils/urls'
 import { sanitizeForHttp, sanitizeHeaders } from '@/lib/mcp/shared'
-import type { McpTool, McpTransport, StoredMcpTool } from '@/lib/mcp/types'
+import type { McpServerStatusConfig, McpTool, McpTransport, StoredMcpTool } from '@/lib/mcp/types'
 import { workflowMcpServerKeys } from '@/hooks/queries/workflow-mcp-servers'
 
 const logger = createLogger('McpQueries')
 
-export type { McpTool, StoredMcpTool }
+export type { McpServerStatusConfig, McpTool, StoredMcpTool }
 
 export const mcpKeys = {
   all: ['mcp'] as const,
-  servers: (workspaceId: string) => [...mcpKeys.all, 'servers', workspaceId] as const,
-  tools: (workspaceId: string) => [...mcpKeys.all, 'tools', workspaceId] as const,
-  storedTools: (workspaceId: string) => [...mcpKeys.all, 'stored', workspaceId] as const,
+  servers: () => [...mcpKeys.all, 'servers'] as const,
+  serversList: (workspaceId?: string) => [...mcpKeys.servers(), workspaceId ?? ''] as const,
+  tools: () => [...mcpKeys.all, 'tools'] as const,
+  toolsList: (workspaceId?: string) => [...mcpKeys.tools(), workspaceId ?? ''] as const,
+  storedTools: () => [...mcpKeys.all, 'storedTools'] as const,
+  storedToolsList: (workspaceId?: string) => [...mcpKeys.storedTools(), workspaceId ?? ''] as const,
   allowedDomains: () => [...mcpKeys.all, 'allowedDomains'] as const,
 }
 
@@ -40,13 +45,15 @@ export type { McpServer }
 /**
  * Input for creating/updating an MCP server (distinct from McpServerConfig in types.ts)
  */
-interface McpServerInput {
+export interface McpServerInput {
   name: string
   transport: McpTransport
   url?: string
   timeout: number
   headers?: Record<string, string>
   enabled: boolean
+  oauthClientId?: string
+  oauthClientSecret?: string
 }
 
 async function fetchMcpServers(workspaceId: string, signal?: AbortSignal): Promise<McpServer[]> {
@@ -66,7 +73,7 @@ async function fetchMcpServers(workspaceId: string, signal?: AbortSignal): Promi
 
 export function useMcpServers(workspaceId: string) {
   return useQuery({
-    queryKey: mcpKeys.servers(workspaceId),
+    queryKey: mcpKeys.serversList(workspaceId),
     queryFn: ({ signal }) => fetchMcpServers(workspaceId, signal),
     enabled: !!workspaceId,
     retry: false,
@@ -96,7 +103,7 @@ async function fetchMcpTools(
 
 export function useMcpToolsQuery(workspaceId: string) {
   return useQuery({
-    queryKey: mcpKeys.tools(workspaceId),
+    queryKey: mcpKeys.toolsList(workspaceId),
     queryFn: ({ signal }) => fetchMcpTools(workspaceId, false, signal),
     enabled: !!workspaceId,
     retry: false,
@@ -108,11 +115,14 @@ export function useMcpToolsQuery(workspaceId: string) {
 export function useForceRefreshMcpTools() {
   const queryClient = useQueryClient()
 
-  return async (workspaceId: string) => {
-    const freshTools = await fetchMcpTools(workspaceId, true)
-    queryClient.setQueryData(mcpKeys.tools(workspaceId), freshTools)
-    return freshTools
-  }
+  return useMutation({
+    mutationFn: (workspaceId: string) => fetchMcpTools(workspaceId, true),
+    onSettled: (_data, _error, workspaceId) => {
+      queryClient.invalidateQueries({ queryKey: mcpKeys.toolsList(workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.serversList(workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.storedToolsList(workspaceId) })
+    },
+  })
 }
 
 interface CreateMcpServerParams {
@@ -138,6 +148,7 @@ export function useCreateMcpServer() {
 
       const serverId = data.data.serverId
       const wasUpdated = data.data.updated === true
+      const authType = data.data.authType
 
       logger.info(
         wasUpdated
@@ -145,50 +156,59 @@ export function useCreateMcpServer() {
           : `Created MCP server: ${config.name} (ID: ${serverId})`
       )
 
+      const { oauthClientSecret: _omitSecret, ...safeServerData } = serverData
       return {
-        ...serverData,
+        ...safeServerData,
         id: serverId,
-        connectionStatus: 'connected' as const,
+        connectionStatus: authType === 'oauth' ? ('disconnected' as const) : ('connected' as const),
         serverId,
         updated: wasUpdated,
+        authType,
       }
     },
-    onSuccess: async (data, variables) => {
-      const freshTools = await fetchMcpTools(variables.workspaceId, true)
+    onSettled: (_data, _error, variables) => {
+      queryClient.invalidateQueries({ queryKey: mcpKeys.serversList(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.toolsList(variables.workspaceId) })
+    },
+  })
+}
 
-      const previousServers = queryClient.getQueryData<McpServer[]>(
-        mcpKeys.servers(variables.workspaceId)
-      )
-      if (previousServers) {
-        const newServer: McpServer = {
-          id: data.id,
-          workspaceId: variables.workspaceId,
-          name: variables.config.name,
-          transport: variables.config.transport,
-          url: variables.config.url,
-          timeout: variables.config.timeout || 30000,
-          headers: variables.config.headers,
-          enabled: variables.config.enabled,
-          connectionStatus: 'connected',
-          createdAt: new Date().toISOString(),
-          updatedAt: new Date().toISOString(),
+/**
+ * Result of `useStartMcpOauth`. When `popup` is set, the caller should wait
+ * for it to close (or for the `mcp-oauth` postMessage) before clearing any
+ * "connecting" UI state.
+ */
+export type StartMcpOauthMutationResult =
+  | { status: 'redirect'; popup: Window }
+  | { status: 'already_authorized' }
+
+export function useStartMcpOauth() {
+  return useMutation<StartMcpOauthMutationResult, Error, { serverId: string; workspaceId: string }>(
+    {
+      mutationFn: async ({ serverId, workspaceId }) => {
+        const result = await requestJson(startMcpOauthContract, {
+          query: { serverId, workspaceId },
+        })
+        if (result.status === 'already_authorized') return { status: 'already_authorized' }
+
+        const parsedUrl = new URL(result.authorizationUrl)
+        const isLoopbackHttp =
+          parsedUrl.protocol === 'http:' && isLoopbackHostname(parsedUrl.hostname)
+        if (parsedUrl.protocol !== 'https:' && !isLoopbackHttp) {
+          throw new Error('Authorization URL must use HTTPS')
         }
-
-        const serverExists = previousServers.some((s) => s.id === data.id)
-        queryClient.setQueryData<McpServer[]>(
-          mcpKeys.servers(variables.workspaceId),
-          serverExists
-            ? previousServers.map((s) => (s.id === data.id ? { ...s, ...newServer } : s))
-            : [...previousServers, newServer]
+        const popup = window.open(
+          result.authorizationUrl,
+          `mcp-oauth-${serverId}`,
+          'width=560,height=720,resizable=yes,scrollbars=yes'
         )
-      }
-
-      queryClient.setQueryData(mcpKeys.tools(variables.workspaceId), freshTools)
-    },
-    onSettled: (_, __, variables) => {
-      queryClient.invalidateQueries({ queryKey: mcpKeys.servers(variables.workspaceId) })
-    },
-  })
+        if (!popup) {
+          throw new Error('Popup blocked. Please allow popups for this site and retry.')
+        }
+        return { status: 'redirect', popup }
+      },
+    }
+  )
 }
 
 interface DeleteMcpServerParams {
@@ -208,9 +228,10 @@ export function useDeleteMcpServer() {
       logger.info(`Deleted MCP server: ${serverId} from workspace: ${workspaceId}`)
       return data
     },
-    onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries({ queryKey: mcpKeys.servers(variables.workspaceId) })
-      queryClient.invalidateQueries({ queryKey: mcpKeys.tools(variables.workspaceId) })
+    onSettled: (_data, _error, variables) => {
+      queryClient.invalidateQueries({ queryKey: mcpKeys.serversList(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.toolsList(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.storedToolsList(variables.workspaceId) })
     },
   })
 }
@@ -242,16 +263,23 @@ export function useUpdateMcpServer() {
       return data.data.server
     },
     onMutate: async ({ workspaceId, serverId, updates }) => {
-      await queryClient.cancelQueries({ queryKey: mcpKeys.servers(workspaceId) })
+      await queryClient.cancelQueries({ queryKey: mcpKeys.serversList(workspaceId) })
 
-      const previousServers = queryClient.getQueryData<McpServer[]>(mcpKeys.servers(workspaceId))
+      const previousServers = queryClient.getQueryData<McpServer[]>(
+        mcpKeys.serversList(workspaceId)
+      )
 
       if (previousServers) {
+        const { oauthClientSecret: _omitSecret, oauthClientId, ...rest } = updates
+        const safeUpdates: Partial<McpServer> = { ...rest }
+        if (oauthClientId !== undefined) {
+          safeUpdates.oauthClientId = oauthClientId || undefined
+        }
         queryClient.setQueryData<McpServer[]>(
-          mcpKeys.servers(workspaceId),
+          mcpKeys.serversList(workspaceId),
           previousServers.map((server) =>
             server.id === serverId
-              ? { ...server, ...updates, updatedAt: new Date().toISOString() }
+              ? { ...server, ...safeUpdates, updatedAt: new Date().toISOString() }
               : server
           )
         )
@@ -261,12 +289,15 @@ export function useUpdateMcpServer() {
     },
     onError: (_err, variables, context) => {
       if (context?.previousServers) {
-        queryClient.setQueryData(mcpKeys.servers(variables.workspaceId), context.previousServers)
+        queryClient.setQueryData(
+          mcpKeys.serversList(variables.workspaceId),
+          context.previousServers
+        )
       }
     },
     onSettled: (_data, _error, variables) => {
-      queryClient.invalidateQueries({ queryKey: mcpKeys.servers(variables.workspaceId) })
-      queryClient.invalidateQueries({ queryKey: mcpKeys.tools(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.serversList(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.toolsList(variables.workspaceId) })
     },
   })
 }
@@ -294,11 +325,10 @@ export function useRefreshMcpServer() {
       logger.info(`Refreshed MCP server: ${serverId}`)
       return data.data
     },
-    onSuccess: async (_data, variables) => {
-      const freshTools = await fetchMcpTools(variables.workspaceId, true)
-      queryClient.setQueryData(mcpKeys.tools(variables.workspaceId), freshTools)
-      await queryClient.invalidateQueries({ queryKey: mcpKeys.servers(variables.workspaceId) })
-      await queryClient.refetchQueries({ queryKey: mcpKeys.storedTools(variables.workspaceId) })
+    onSettled: (_data, _error, variables) => {
+      queryClient.invalidateQueries({ queryKey: mcpKeys.serversList(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.toolsList(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.storedToolsList(variables.workspaceId) })
     },
   })
 }
@@ -316,7 +346,7 @@ async function fetchStoredMcpTools(
 
 export function useStoredMcpTools(workspaceId: string) {
   return useQuery({
-    queryKey: mcpKeys.storedTools(workspaceId),
+    queryKey: mcpKeys.storedToolsList(workspaceId),
     queryFn: ({ signal }) => fetchStoredMcpTools(workspaceId, signal),
     enabled: !!workspaceId,
     staleTime: 60 * 1000,
@@ -350,9 +380,9 @@ export function useMcpToolsEvents(workspaceId: string) {
     if (!workspaceId) return
 
     const invalidate = () => {
-      queryClient.invalidateQueries({ queryKey: mcpKeys.tools(workspaceId) })
-      queryClient.invalidateQueries({ queryKey: mcpKeys.servers(workspaceId) })
-      queryClient.invalidateQueries({ queryKey: mcpKeys.storedTools(workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.toolsList(workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.serversList(workspaceId) })
+      queryClient.invalidateQueries({ queryKey: mcpKeys.storedToolsList(workspaceId) })
       queryClient.invalidateQueries({ queryKey: workflowMcpServerKeys.all })
     }
 
diff --git a/apps/sim/lib/api/contracts/mcp.ts b/apps/sim/lib/api/contracts/mcp.ts
index 3a8c8e9d051..325201d1dc3 100644
--- a/apps/sim/lib/api/contracts/mcp.ts
+++ b/apps/sim/lib/api/contracts/mcp.ts
@@ -34,6 +34,8 @@ const optionalHeadersFromNullableSchema = z.preprocess(
 
 export const mcpTransportSchema = z.enum(['streamable-http'])
 
+export const mcpAuthTypeSchema = z.enum(['none', 'headers', 'oauth'])
+
 export const mcpServerStatusConfigSchema = z
   .object({
     consecutiveFailures: z.number().default(0),
@@ -88,6 +90,7 @@ export const mcpServerSchema = z
     name: z.string(),
     description: optionalStringFromNullableSchema,
     transport: mcpTransportSchema,
+    authType: mcpAuthTypeSchema.optional(),
     url: optionalStringFromNullableSchema,
     timeout: optionalNumberFromNullableSchema,
     retries: optionalNumberFromNullableSchema,
@@ -105,6 +108,8 @@ export const mcpServerSchema = z
     createdAt: dateStringSchema,
     updatedAt: dateStringSchema,
     deletedAt: optionalDateStringFromNullableSchema,
+    oauthClientId: optionalStringFromNullableSchema,
+    hasOauthClientSecret: z.boolean().optional(),
   })
   .passthrough()
 export type McpServer = z.output<typeof mcpServerSchema>
@@ -123,12 +128,15 @@ export const createMcpServerBodySchema = z
     description: z.string().optional(),
     transport: mcpTransportSchema,
     url: z.string().optional(),
+    authType: mcpAuthTypeSchema.optional(),
     headers: z.record(z.string(), z.string()).optional(),
     timeout: z.number().optional(),
     retries: z.number().optional(),
     enabled: z.boolean().optional(),
     source: z.string().optional(),
     workspaceId: z.string().optional(),
+    oauthClientId: z.string().nullable().optional(),
+    oauthClientSecret: z.string().nullable().optional(),
   })
   .passthrough()
 
@@ -178,6 +186,21 @@ export const mcpToolExecutionBodySchema = z
   .passthrough()
 export type McpToolExecutionBody = z.input<typeof mcpToolExecutionBodySchema>
 
+export const mcpToolResultSchema = z
+  .object({
+    content: z.array(z.unknown()).optional(),
+    isError: z.boolean().optional(),
+    structuredContent: z.unknown().optional(),
+  })
+  .passthrough()
+
+export const mcpToolExecutionResultSchema = z.object({
+  success: z.boolean(),
+  output: mcpToolResultSchema.optional(),
+  error: z.string().optional(),
+})
+export type McpToolExecutionResult = z.output<typeof mcpToolExecutionResultSchema>
+
 export const mcpJsonRpcRequestSchema = z
   .object({
     jsonrpc: z.literal('2.0'),
@@ -283,6 +306,7 @@ export const createMcpServerContract = defineRouteContract({
       z.object({
         serverId: z.string(),
         updated: z.boolean().optional(),
+        authType: mcpAuthTypeSchema.optional(),
       })
     ),
   },
@@ -391,6 +415,59 @@ export const testMcpServerConnectionContract = defineRouteContract({
   },
 })
 
+export const executeMcpToolContract = defineRouteContract({
+  method: 'POST',
+  path: '/api/mcp/tools/execute',
+  body: mcpToolExecutionBodySchema,
+  response: {
+    mode: 'json',
+    schema: mcpSuccessResponseSchema(mcpToolExecutionResultSchema),
+  },
+})
+export type ExecuteMcpToolResponse = ContractJsonResponse<typeof executeMcpToolContract>
+
+export const startMcpOauthQuerySchema = z.object({
+  serverId: z.string().min(1, 'serverId is required'),
+  workspaceId: z.string().min(1, 'workspaceId is required'),
+})
+
+export const startMcpOauthResultSchema = z.discriminatedUnion('status', [
+  z.object({ status: z.literal('redirect'), authorizationUrl: z.string().url() }),
+  z.object({ status: z.literal('already_authorized') }),
+])
+export type StartMcpOauthResult = z.output<typeof startMcpOauthResultSchema>
+
+export const startMcpOauthContract = defineRouteContract({
+  method: 'GET',
+  path: '/api/mcp/oauth/start',
+  query: startMcpOauthQuerySchema,
+  response: {
+    mode: 'json',
+    schema: startMcpOauthResultSchema,
+  },
+})
+
+/**
+ * Provider can return any subset depending on the outcome:
+ * - success: `state` + `code`
+ * - provider error: `error` + optional `error_description` + optional `state`
+ * - malformed callback: nothing
+ * All fields are optional so the route can render an HTML error page itself.
+ */
+export const mcpOauthCallbackQuerySchema = z.object({
+  state: z.string().optional(),
+  code: z.string().optional(),
+  error: z.string().optional(),
+  error_description: z.string().optional(),
+})
+
+export const mcpOauthCallbackContract = defineRouteContract({
+  method: 'GET',
+  path: '/api/mcp/oauth/callback',
+  query: mcpOauthCallbackQuerySchema,
+  response: { mode: 'text' },
+})
+
 export const getAllowedMcpDomainsContract = defineRouteContract({
   method: 'GET',
   path: '/api/settings/allowed-mcp-domains',
diff --git a/apps/sim/lib/core/utils/urls.ts b/apps/sim/lib/core/utils/urls.ts
index 0ead2240e52..1c2da16ec5b 100644
--- a/apps/sim/lib/core/utils/urls.ts
+++ b/apps/sim/lib/core/utils/urls.ts
@@ -103,7 +103,16 @@ export function getEmailDomain(): string {
 
 const DEFAULT_SOCKET_URL = 'http://localhost:3002'
 const DEFAULT_OLLAMA_URL = 'http://localhost:11434'
-const LOCALHOST_HOSTNAMES = new Set(['localhost', '127.0.0.1', '[::1]', '::1'])
+export const LOCALHOST_HOSTNAMES: ReadonlySet<string> = new Set([
+  'localhost',
+  '127.0.0.1',
+  '[::1]',
+  '::1',
+])
+
+export function isLoopbackHostname(hostname: string): boolean {
+  return LOCALHOST_HOSTNAMES.has(hostname)
+}
 
 /**
  * Parses a comma-separated list of origins (e.g. from a `TRUSTED_ORIGINS` env
diff --git a/apps/sim/lib/mcp/client.test.ts b/apps/sim/lib/mcp/client.test.ts
index 389062627b0..405b66610e9 100644
--- a/apps/sim/lib/mcp/client.test.ts
+++ b/apps/sim/lib/mcp/client.test.ts
@@ -39,8 +39,9 @@ vi.mock('@/lib/core/execution-limits', () => ({
   getMaxExecutionTimeout: vi.fn().mockReturnValue(30000),
 }))
 
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
 import { McpClient } from './client'
-import type { McpServerConfig } from './types'
+import type { McpClientOptions, McpServerConfig } from './types'
 
 function createConfig(): McpServerConfig {
   return {
@@ -54,6 +55,7 @@ function createConfig(): McpServerConfig {
 describe('McpClient notification handler', () => {
   beforeEach(() => {
     capturedNotificationHandler = null
+    vi.clearAllMocks()
   })
 
   it('fires onToolsChanged when a notification arrives while connected', async () => {
@@ -103,4 +105,25 @@ describe('McpClient notification handler', () => {
 
     expect(capturedNotificationHandler).toBeNull()
   })
+
+  it('passes configured headers for OAuth transports as well as header auth transports', () => {
+    const authProvider = {} as unknown as NonNullable<McpClientOptions['authProvider']>
+    new McpClient({
+      config: {
+        ...createConfig(),
+        authType: 'oauth',
+        headers: { 'X-Sim-Via': 'workflow' },
+      },
+      securityPolicy: { requireConsent: false, auditLevel: 'basic' },
+      authProvider,
+    })
+
+    expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
+      new URL('https://test.example.com/mcp'),
+      {
+        authProvider,
+        requestInit: { headers: { 'X-Sim-Via': 'workflow' } },
+      }
+    )
+  })
 })
diff --git a/apps/sim/lib/mcp/client.ts b/apps/sim/lib/mcp/client.ts
index bbc5cb19e00..819afc56601 100644
--- a/apps/sim/lib/mcp/client.ts
+++ b/apps/sim/lib/mcp/client.ts
@@ -8,6 +8,7 @@
  * - Custom security/consent layer
  */
 
+import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
 import {
@@ -18,6 +19,7 @@ import {
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
+import { McpOauthRedirectRequired } from '@/lib/mcp/oauth'
 import { createMcpPinnedFetch } from '@/lib/mcp/pinned-fetch'
 import {
   type McpClientOptions,
@@ -44,6 +46,7 @@ export class McpClient {
   private connectionStatus: McpConnectionStatus
   private securityPolicy: McpSecurityPolicy
   private onToolsChanged?: McpToolsChangedCallback
+  private authProvider?: McpClientOptions['authProvider']
   private isConnected = false
 
   private static readonly SUPPORTED_VERSIONS = [
@@ -60,6 +63,7 @@ export class McpClient {
       maxToolExecutionsPerHour: 1000,
     }
     this.onToolsChanged = options.onToolsChanged
+    this.authProvider = options.authProvider
     const resolvedIP = options.resolvedIP
 
     this.connectionStatus = { connected: false }
@@ -68,10 +72,13 @@ export class McpClient {
       throw new McpError('URL required for Streamable HTTP transport')
     }
 
+    if (this.config.authType === 'oauth' && this.authProvider == null) {
+      throw new McpError('OAuth MCP server requires an authProvider')
+    }
+    const useOauth = this.config.authType === 'oauth'
     this.transport = new StreamableHTTPClientTransport(new URL(this.config.url), {
-      requestInit: {
-        headers: this.config.headers,
-      },
+      authProvider: useOauth ? this.authProvider : undefined,
+      requestInit: { headers: this.config.headers },
       ...(resolvedIP ? { fetch: createMcpPinnedFetch(resolvedIP) } : {}),
     })
 
@@ -115,9 +122,13 @@ export class McpClient {
         protocolVersion: serverVersion,
       })
     } catch (error) {
+      this.isConnected = false
+      if (error instanceof McpOauthRedirectRequired || error instanceof UnauthorizedError) {
+        this.connectionStatus.lastError = undefined
+        throw error
+      }
       const errorMessage = getErrorMessage(error, 'Unknown error')
       this.connectionStatus.lastError = errorMessage
-      this.isConnected = false
       logger.error(`Failed to connect to MCP server ${this.config.name}:`, error)
       throw new McpConnectionError(errorMessage, this.config.name)
     }
diff --git a/apps/sim/lib/mcp/connection-manager.test.ts b/apps/sim/lib/mcp/connection-manager.test.ts
index b464235153f..ee880b968ba 100644
--- a/apps/sim/lib/mcp/connection-manager.test.ts
+++ b/apps/sim/lib/mcp/connection-manager.test.ts
@@ -28,13 +28,17 @@ function serverConfig(id: string, name = `Server ${id}`) {
   }
 }
 
-const { MockMcpClientConstructor, mockOnToolsChanged, mockPublishToolsChanged } = vi.hoisted(
-  () => ({
-    MockMcpClientConstructor: vi.fn(),
-    mockOnToolsChanged: vi.fn(() => vi.fn()),
-    mockPublishToolsChanged: vi.fn(),
-  })
-)
+const {
+  MockMcpClientConstructor,
+  mockOnToolsChanged,
+  mockPublishToolsChanged,
+  mockGetOrCreateOauthRow,
+} = vi.hoisted(() => ({
+  MockMcpClientConstructor: vi.fn(),
+  mockOnToolsChanged: vi.fn(() => vi.fn()),
+  mockPublishToolsChanged: vi.fn(),
+  mockGetOrCreateOauthRow: vi.fn(),
+}))
 
 vi.mock('@/lib/core/config/feature-flags', () => ({ isTest: false }))
 vi.mock('@/lib/mcp/pubsub', () => ({
@@ -46,6 +50,11 @@ vi.mock('@/lib/mcp/pubsub', () => ({
 vi.mock('@/lib/mcp/client', () => ({
   McpClient: MockMcpClientConstructor,
 }))
+vi.mock('@/lib/mcp/oauth', () => ({
+  getOrCreateOauthRow: mockGetOrCreateOauthRow,
+  loadPreregisteredClient: vi.fn(),
+  SimMcpOauthProvider: vi.fn().mockImplementation((value) => value),
+}))
 
 import { McpConnectionManager } from '@/lib/mcp/connection-manager'
 
@@ -54,6 +63,17 @@ describe('McpConnectionManager', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    mockGetOrCreateOauthRow.mockResolvedValue({
+      id: 'oauth-row-1',
+      mcpServerId: 'server-oauth',
+      userId: 'authorizer-1',
+      workspaceId: 'ws-1',
+      clientInformation: null,
+      tokens: { access_token: 'workspace-token', token_type: 'Bearer' },
+      codeVerifier: null,
+      state: null,
+      updatedAt: new Date(),
+    })
   })
 
   afterEach(() => {
@@ -98,6 +118,37 @@ describe('McpConnectionManager', () => {
       expect(r2.supportsListChanged).toBe(false)
     })
 
+    it('shares OAuth managed connections across workspace users for the same server', async () => {
+      const instances: MockMcpClient[] = []
+
+      MockMcpClientConstructor.mockImplementation(() => {
+        const instance: MockMcpClient = {
+          connect: vi.fn().mockResolvedValue(undefined),
+          disconnect: vi.fn().mockResolvedValue(undefined),
+          hasListChangedCapability: vi.fn().mockReturnValue(true),
+          onClose: vi.fn(),
+        }
+        instances.push(instance)
+        return instance
+      })
+
+      const mgr = createFreshManager()
+      const config = { ...serverConfig('server-oauth'), authType: 'oauth' as const }
+
+      const r1 = await mgr.connect(config, 'user-1', 'ws-1')
+      const r2 = await mgr.connect(config, 'user-2', 'ws-1')
+
+      expect(instances).toHaveLength(1)
+      expect(r1.supportsListChanged).toBe(true)
+      expect(r2.supportsListChanged).toBe(true)
+      expect(mockGetOrCreateOauthRow).toHaveBeenCalledTimes(1)
+      expect(mockGetOrCreateOauthRow).toHaveBeenCalledWith({
+        mcpServerId: 'server-oauth',
+        userId: 'user-1',
+        workspaceId: 'ws-1',
+      })
+    })
+
     it('allows a new connect() after a previous one completes', async () => {
       const instances: MockMcpClient[] = []
 
diff --git a/apps/sim/lib/mcp/connection-manager.ts b/apps/sim/lib/mcp/connection-manager.ts
index a150b194a87..6b80f3c06a6 100644
--- a/apps/sim/lib/mcp/connection-manager.ts
+++ b/apps/sim/lib/mcp/connection-manager.ts
@@ -13,9 +13,11 @@
 import { createLogger } from '@sim/logger'
 import { isTest } from '@/lib/core/config/feature-flags'
 import { McpClient } from '@/lib/mcp/client'
+import { getOrCreateOauthRow, loadPreregisteredClient, SimMcpOauthProvider } from '@/lib/mcp/oauth'
 import { mcpPubSub } from '@/lib/mcp/pubsub'
 import type {
   ManagedConnectionState,
+  McpClientOptions,
   McpServerConfig,
   McpToolsChangedCallback,
   ToolsChangedEvent,
@@ -31,6 +33,15 @@ const IDLE_CHECK_INTERVAL_MS = 5 * 60 * 1000 // 5 minutes
 
 type ToolsChangedListener = (event: ToolsChangedEvent) => void
 
+/**
+ * Cache key for managed connections.
+ * MCP servers are workspace-owned, so OAuth/header/no-auth connections are
+ * keyed by server and share the same workspace-scoped server credentials.
+ */
+function connectionKey(config: McpServerConfig): string {
+  return config.id
+}
+
 export class McpConnectionManager {
   private connections = new Map<string, McpClient>()
   private states = new Map<string, ManagedConnectionState>()
@@ -79,11 +90,11 @@ export class McpConnectionManager {
       return { supportsListChanged: false }
     }
 
-    const serverId = config.id
+    const key = connectionKey(config)
 
-    if (this.connections.has(serverId) || this.connectingServers.has(serverId)) {
+    if (this.connections.has(key) || this.connectingServers.has(key)) {
       logger.info(`[${config.name}] Already has a managed connection or is connecting, skipping`)
-      const state = this.states.get(serverId)
+      const state = this.states.get(key)
       return { supportsListChanged: state?.supportsListChanged ?? false }
     }
 
@@ -92,11 +103,28 @@ export class McpConnectionManager {
       return { supportsListChanged: false }
     }
 
-    this.connectingServers.add(serverId)
+    this.connectingServers.add(key)
 
     try {
-      const onToolsChanged: McpToolsChangedCallback = (sid) => {
-        this.handleToolsChanged(sid)
+      const onToolsChanged: McpToolsChangedCallback = () => {
+        this.handleToolsChanged(key)
+      }
+
+      let authProvider: McpClientOptions['authProvider']
+      if (config.authType === 'oauth') {
+        const row = await getOrCreateOauthRow({
+          mcpServerId: config.id,
+          userId,
+          workspaceId,
+        })
+        if (!row.tokens) {
+          logger.info(
+            `[${config.name}] OAuth server has no workspace tokens — skipping persistent connection until authorized`
+          )
+          return { supportsListChanged: false }
+        }
+        const preregistered = await loadPreregisteredClient(config.id)
+        authProvider = new SimMcpOauthProvider({ row, preregistered })
       }
 
       const client = new McpClient({
@@ -108,6 +136,7 @@ export class McpConnectionManager {
         },
         onToolsChanged,
         resolvedIP: resolvedIP ?? undefined,
+        authProvider,
       })
 
       try {
@@ -127,11 +156,11 @@ export class McpConnectionManager {
         return { supportsListChanged: false }
       }
 
-      this.clearReconnectTimer(serverId)
+      this.clearReconnectTimer(key)
 
-      this.connections.set(serverId, client)
-      this.states.set(serverId, {
-        serverId,
+      this.connections.set(key, client)
+      this.states.set(key, {
+        serverId: config.id,
         serverName: config.name,
         workspaceId,
         userId,
@@ -150,42 +179,49 @@ export class McpConnectionManager {
       logger.info(`[${config.name}] Persistent connection established (listChanged supported)`)
       return { supportsListChanged: true }
     } finally {
-      this.connectingServers.delete(serverId)
+      this.connectingServers.delete(key)
     }
   }
 
   /**
-   * Disconnect a managed connection.
+   * Disconnect a managed connection by internal cache key.
    */
-  async disconnect(serverId: string): Promise<void> {
-    this.clearReconnectTimer(serverId)
+  private async disconnectByKey(key: string): Promise<void> {
+    this.clearReconnectTimer(key)
 
-    const client = this.connections.get(serverId)
+    const client = this.connections.get(key)
     if (client) {
       try {
         await client.disconnect()
       } catch (error) {
-        logger.warn(`Error disconnecting managed client ${serverId}:`, error)
+        logger.warn(`Error disconnecting managed client ${key}:`, error)
       }
-      this.connections.delete(serverId)
+      this.connections.delete(key)
     }
 
-    this.states.delete(serverId)
-    logger.info(`Managed connection removed: ${serverId}`)
+    this.states.delete(key)
+    logger.info(`Managed connection removed: ${key}`)
   }
 
   /**
-   * Check whether a managed connection exists for the given server.
+   * Disconnect the managed connection for the given server.
    */
-  hasConnection(serverId: string): boolean {
-    return this.connections.has(serverId)
+  async disconnectServer(serverId: string): Promise<void> {
+    const keys: string[] = []
+    for (const [key, state] of this.states) {
+      if (state.serverId === serverId) keys.push(key)
+    }
+    await Promise.all(keys.map((key) => this.disconnectByKey(key)))
   }
 
   /**
-   * Get connection state for a server.
+   * Check whether a managed connection exists for the given server.
    */
-  getState(serverId: string): ManagedConnectionState | undefined {
-    return this.states.get(serverId)
+  hasConnection(serverId: string): boolean {
+    for (const state of this.states.values()) {
+      if (state.serverId === serverId) return true
+    }
+    return false
   }
 
   /**
@@ -249,14 +285,14 @@ export class McpConnectionManager {
    * Handle a tools/list_changed notification from an external MCP server.
    * Publishes to pub/sub so all processes are notified.
    */
-  private handleToolsChanged(serverId: string): void {
-    const state = this.states.get(serverId)
+  private handleToolsChanged(key: string): void {
+    const state = this.states.get(key)
     if (!state) return
 
     state.lastActivity = Date.now()
 
     const event: ToolsChangedEvent = {
-      serverId,
+      serverId: state.serverId,
       serverName: state.serverName,
       workspaceId: state.workspaceId,
       timestamp: Date.now(),
@@ -268,13 +304,13 @@ export class McpConnectionManager {
   }
 
   private handleDisconnect(config: McpServerConfig, userId: string, workspaceId: string): void {
-    const serverId = config.id
-    const state = this.states.get(serverId)
+    const key = connectionKey(config)
+    const state = this.states.get(key)
 
     if (!state || this.disposed) return
 
     state.connected = false
-    this.connections.delete(serverId)
+    this.connections.delete(key)
 
     logger.warn(`[${config.name}] Persistent connection lost, scheduling reconnect`)
 
@@ -282,8 +318,8 @@ export class McpConnectionManager {
   }
 
   private scheduleReconnect(config: McpServerConfig, userId: string, workspaceId: string): void {
-    const serverId = config.id
-    const state = this.states.get(serverId)
+    const key = connectionKey(config)
+    const state = this.states.get(key)
 
     if (!state || this.disposed) return
 
@@ -291,7 +327,7 @@ export class McpConnectionManager {
       logger.error(
         `[${config.name}] Max reconnect attempts (${MAX_RECONNECT_ATTEMPTS}) reached — giving up`
       )
-      this.states.delete(serverId)
+      this.states.delete(key)
       return
     }
 
@@ -302,14 +338,14 @@ export class McpConnectionManager {
       `[${config.name}] Reconnecting in ${delay}ms (attempt ${state.reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})`
     )
 
-    this.clearReconnectTimer(serverId)
+    this.clearReconnectTimer(key)
 
     const timer = setTimeout(async () => {
-      this.reconnectTimers.delete(serverId)
+      this.reconnectTimers.delete(key)
 
       if (this.disposed) return
 
-      const currentState = this.states.get(serverId)
+      const currentState = this.states.get(key)
       if (currentState?.connected) {
         logger.info(
           `[${config.name}] Connection already re-established externally, skipping reconnect`
@@ -318,8 +354,8 @@ export class McpConnectionManager {
       }
 
       const attempts = state.reconnectAttempts
-      this.connections.delete(serverId)
-      this.states.delete(serverId)
+      this.connections.delete(key)
+      this.states.delete(key)
 
       try {
         const result = await this.connect(config, userId, workspaceId)
@@ -336,14 +372,14 @@ export class McpConnectionManager {
       }
     }, delay)
 
-    this.reconnectTimers.set(serverId, timer)
+    this.reconnectTimers.set(key, timer)
   }
 
-  private clearReconnectTimer(serverId: string): void {
-    const timer = this.reconnectTimers.get(serverId)
+  private clearReconnectTimer(key: string): void {
+    const timer = this.reconnectTimers.get(key)
     if (timer) {
       clearTimeout(timer)
-      this.reconnectTimers.delete(serverId)
+      this.reconnectTimers.delete(key)
     }
   }
 
@@ -356,8 +392,9 @@ export class McpConnectionManager {
     workspaceId: string,
     reconnectAttempts: number
   ): void {
-    if (!this.states.has(config.id)) {
-      this.states.set(config.id, {
+    const key = connectionKey(config)
+    if (!this.states.has(key)) {
+      this.states.set(key, {
         serverId: config.id,
         serverName: config.name,
         workspaceId,
@@ -375,12 +412,12 @@ export class McpConnectionManager {
 
     this.idleCheckTimer = setInterval(() => {
       const now = Date.now()
-      for (const [serverId, state] of this.states) {
+      for (const [key, state] of this.states) {
         if (now - state.lastActivity > IDLE_TIMEOUT_MS) {
           logger.info(
             `[${state.serverName}] Idle timeout reached, disconnecting managed connection`
           )
-          this.disconnect(serverId)
+          this.disconnectByKey(key)
         }
       }
 
diff --git a/apps/sim/lib/mcp/middleware.ts b/apps/sim/lib/mcp/middleware.ts
index 3aca53c609a..6e4aa816221 100644
--- a/apps/sim/lib/mcp/middleware.ts
+++ b/apps/sim/lib/mcp/middleware.ts
@@ -10,7 +10,7 @@ const logger = createLogger('McpAuthMiddleware')
 
 export type McpPermissionLevel = 'read' | 'write' | 'admin'
 
-interface McpAuthContext {
+export interface McpAuthContext {
   userId: string
   userName?: string | null
   userEmail?: string | null
diff --git a/apps/sim/lib/mcp/oauth/callback-reasons.ts b/apps/sim/lib/mcp/oauth/callback-reasons.ts
new file mode 100644
index 00000000000..e0f348adc94
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/callback-reasons.ts
@@ -0,0 +1,23 @@
+/**
+ * Reasons surfaced from the OAuth callback popup back to the parent window via
+ * `window.opener.postMessage`. Consumed by the popup hook to render user-facing
+ * status messages and by the callback route to discriminate failure modes.
+ */
+export type McpOauthCallbackReason =
+  | 'authorized'
+  | 'provider_error'
+  | 'missing_params'
+  | 'unauthenticated'
+  | 'invalid_state'
+  | 'user_mismatch'
+  | 'server_gone'
+  | 'insecure_url'
+  | 'token_exchange_failed'
+  | 'unknown'
+
+export interface McpOauthCallbackMessage {
+  type: 'mcp-oauth'
+  ok: boolean
+  serverId?: string
+  reason?: McpOauthCallbackReason
+}
diff --git a/apps/sim/lib/mcp/oauth/creds-diff.ts b/apps/sim/lib/mcp/oauth/creds-diff.ts
new file mode 100644
index 00000000000..5d265ae22f9
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/creds-diff.ts
@@ -0,0 +1,39 @@
+import { decryptSecret } from '@/lib/core/security/encryption'
+
+interface OauthCredsDiffParams {
+  incomingClientId: string | null | undefined
+  incomingClientIdProvided: boolean
+  incomingClientSecret: string | null | undefined
+  incomingClientSecretProvided: boolean
+  currentClientId: string | null | undefined
+  currentEncryptedClientSecret: string | null | undefined
+}
+
+/**
+ * Detect whether OAuth client credentials on an MCP server row have changed.
+ * Decrypt failure (corrupted ciphertext, rotated key) is treated as a change so
+ * admins can overwrite an unusable stored secret instead of getting a 500.
+ */
+export async function oauthCredsChanged(params: OauthCredsDiffParams): Promise<boolean> {
+  const clientIdChanged =
+    params.incomingClientIdProvided &&
+    (params.incomingClientId || null) !== (params.currentClientId ?? null)
+
+  let clientSecretChanged = false
+  if (params.incomingClientSecretProvided) {
+    if (!params.incomingClientSecret) {
+      clientSecretChanged = params.currentEncryptedClientSecret != null
+    } else if (!params.currentEncryptedClientSecret) {
+      clientSecretChanged = true
+    } else {
+      try {
+        const { decrypted } = await decryptSecret(params.currentEncryptedClientSecret)
+        clientSecretChanged = decrypted !== params.incomingClientSecret
+      } catch {
+        clientSecretChanged = true
+      }
+    }
+  }
+
+  return clientIdChanged || clientSecretChanged
+}
diff --git a/apps/sim/lib/mcp/oauth/index.ts b/apps/sim/lib/mcp/oauth/index.ts
new file mode 100644
index 00000000000..41dd96111cc
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/index.ts
@@ -0,0 +1,30 @@
+export type {
+  McpOauthCallbackMessage,
+  McpOauthCallbackReason,
+} from './callback-reasons'
+export { oauthCredsChanged } from './creds-diff'
+export { detectMcpAuthType } from './probe'
+export {
+  loadPreregisteredClient,
+  McpOauthRedirectRequired,
+  type PreregisteredClient,
+  SimMcpOauthProvider,
+} from './provider'
+export { revokeMcpOauthTokens } from './revoke'
+export {
+  clearClient,
+  clearState,
+  clearTokens,
+  clearVerifier,
+  getOrCreateOauthRow,
+  loadOauthRow,
+  loadOauthRowByState,
+  type McpOauthRow,
+  saveClientInformation,
+  saveCodeVerifier,
+  saveState,
+  saveTokens,
+  setOauthRowUser,
+  withMcpOauthRefreshLock,
+} from './storage'
+export { assertSafeOauthServerUrl, McpOauthInsecureUrlError } from './url-validation'
diff --git a/apps/sim/lib/mcp/oauth/probe.ts b/apps/sim/lib/mcp/oauth/probe.ts
new file mode 100644
index 00000000000..a9892d4e6e6
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/probe.ts
@@ -0,0 +1,92 @@
+import { extractWWWAuthenticateParams } from '@modelcontextprotocol/sdk/client/auth.js'
+import { createLogger } from '@sim/logger'
+import { isLoopbackHostname } from '@/lib/core/utils/urls'
+import type { McpAuthType } from '@/lib/mcp/types'
+
+const logger = createLogger('McpOauthProbe')
+
+const PROBE_TIMEOUT_MS = 5000
+
+export async function detectMcpAuthType(url: string): Promise<McpAuthType> {
+  let parsed: URL
+  try {
+    parsed = new URL(url)
+  } catch {
+    return 'headers'
+  }
+  const isLoopbackHttp = parsed.protocol === 'http:' && isLoopbackHostname(parsed.hostname)
+  if (parsed.protocol !== 'https:' && !isLoopbackHttp) {
+    return 'headers'
+  }
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS)
+
+  try {
+    const res = await fetch(url, {
+      method: 'POST',
+      redirect: 'manual',
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json, text/event-stream',
+      },
+      body: JSON.stringify({
+        jsonrpc: '2.0',
+        id: 1,
+        method: 'initialize',
+        params: {
+          protocolVersion: '2025-06-18',
+          capabilities: {},
+          clientInfo: { name: 'sim-platform-probe', version: '1.0.0' },
+        },
+      }),
+      signal: controller.signal,
+    })
+
+    const sessionId = res.headers.get('mcp-session-id')
+    if (sessionId) {
+      void closeMcpSession(url, sessionId)
+    }
+
+    if (res.status === 401) {
+      const params = extractWWWAuthenticateParams(res)
+      // Per RFC 9728, an OAuth-protected resource signals OAuth via
+      // `resource_metadata=...` in WWW-Authenticate. `scope=...` is also an
+      // OAuth-specific hint. A bare `error="invalid_token"` is generic Bearer
+      // and used by plain API-key servers too, so it must not classify as OAuth.
+      if (params.resourceMetadataUrl || params.scope) {
+        return 'oauth'
+      }
+      return 'headers'
+    }
+
+    if (res.ok) return 'none'
+    return 'headers'
+  } catch (e) {
+    logger.warn(`Probe failed for ${url}`, e)
+    return 'headers'
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
+/**
+ * Best-effort DELETE to release the streamable-HTTP session the probe just
+ * allocated. Failures are ignored — the session will expire on the server side.
+ */
+async function closeMcpSession(url: string, sessionId: string): Promise<void> {
+  try {
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS)
+    try {
+      await fetch(url, {
+        method: 'DELETE',
+        headers: { 'Mcp-Session-Id': sessionId },
+        signal: controller.signal,
+      })
+    } finally {
+      clearTimeout(timer)
+    }
+  } catch {
+    // Ignore — best-effort cleanup
+  }
+}
diff --git a/apps/sim/lib/mcp/oauth/provider.ts b/apps/sim/lib/mcp/oauth/provider.ts
new file mode 100644
index 00000000000..9b130e06453
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/provider.ts
@@ -0,0 +1,179 @@
+import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js'
+import type {
+  OAuthClientInformationMixed,
+  OAuthClientMetadata,
+  OAuthTokens,
+} from '@modelcontextprotocol/sdk/shared/auth.js'
+import { db } from '@sim/db'
+import { mcpServers } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
+import { eq } from 'drizzle-orm'
+import { decryptSecret } from '@/lib/core/security/encryption'
+import { getBaseUrl } from '@/lib/core/utils/urls'
+import {
+  clearClient,
+  clearState,
+  clearTokens,
+  clearVerifier,
+  type McpOauthRow,
+  saveClientInformation as saveClientInformationDb,
+  saveCodeVerifier as saveCodeVerifierDb,
+  saveState,
+  saveTokens as saveTokensDb,
+} from '@/lib/mcp/oauth/storage'
+
+const logger = createLogger('SimMcpOauthProvider')
+
+export class McpOauthRedirectRequired extends Error {
+  constructor(public readonly authorizationUrl: string) {
+    super('MCP OAuth redirect required')
+    this.name = 'McpOauthRedirectRequired'
+  }
+}
+
+export interface PreregisteredClient {
+  clientId: string
+  clientSecret?: string
+}
+
+interface SimMcpOauthProviderInit {
+  row: McpOauthRow
+  scope?: string
+  /**
+   * Optional user-supplied client credentials. When provided, the SDK skips
+   * Dynamic Client Registration and uses these for the auth/token exchange.
+   */
+  preregistered?: PreregisteredClient
+}
+
+export class SimMcpOauthProvider implements OAuthClientProvider {
+  private row: McpOauthRow
+  private readonly scope?: string
+  private readonly preregistered?: PreregisteredClient
+
+  constructor({ row, scope, preregistered }: SimMcpOauthProviderInit) {
+    this.row = row
+    this.scope = scope
+    this.preregistered = preregistered
+  }
+
+  get redirectUrl(): string {
+    return `${getBaseUrl().replace(/\/$/, '')}/api/mcp/oauth/callback`
+  }
+
+  get clientMetadata(): OAuthClientMetadata {
+    const meta: OAuthClientMetadata = {
+      client_name: 'Sim',
+      redirect_uris: [this.redirectUrl],
+      grant_types: ['authorization_code', 'refresh_token'],
+      response_types: ['code'],
+      token_endpoint_auth_method: this.preregistered?.clientSecret ? 'client_secret_post' : 'none',
+    }
+    if (this.scope) meta.scope = this.scope
+    return meta
+  }
+
+  async state(): Promise<string> {
+    const state = generateId()
+    await saveState(this.row.id, state)
+    return state
+  }
+
+  clientInformation(): OAuthClientInformationMixed | undefined {
+    if (this.row.clientInformation) return this.row.clientInformation
+    if (this.preregistered) {
+      return {
+        client_id: this.preregistered.clientId,
+        client_secret: this.preregistered.clientSecret,
+        redirect_uris: [this.redirectUrl],
+        grant_types: ['authorization_code', 'refresh_token'],
+        response_types: ['code'],
+        token_endpoint_auth_method: this.preregistered.clientSecret ? 'client_secret_post' : 'none',
+      }
+    }
+    return undefined
+  }
+
+  async saveClientInformation(info: OAuthClientInformationMixed): Promise<void> {
+    if (this.preregistered) return
+    await saveClientInformationDb(this.row.id, info)
+    this.row.clientInformation = info
+  }
+
+  tokens(): OAuthTokens | undefined {
+    return this.row.tokens ?? undefined
+  }
+
+  async saveTokens(tokens: OAuthTokens): Promise<void> {
+    await saveTokensDb(this.row.id, tokens)
+    this.row.tokens = tokens
+  }
+
+  async redirectToAuthorization(authorizationUrl: URL): Promise<void> {
+    throw new McpOauthRedirectRequired(authorizationUrl.toString())
+  }
+
+  async saveCodeVerifier(codeVerifier: string): Promise<void> {
+    await saveCodeVerifierDb(this.row.id, codeVerifier)
+    this.row.codeVerifier = codeVerifier
+  }
+
+  async codeVerifier(): Promise<string> {
+    if (!this.row.codeVerifier) {
+      throw new Error('No PKCE code verifier saved for this MCP OAuth session')
+    }
+    return this.row.codeVerifier
+  }
+
+  async invalidateCredentials(
+    scope: 'all' | 'client' | 'tokens' | 'verifier' | 'discovery'
+  ): Promise<void> {
+    if (scope === 'all' || scope === 'client') {
+      await clearClient(this.row.id)
+      this.row.clientInformation = null
+    }
+    if (scope === 'all' || scope === 'tokens') {
+      await clearTokens(this.row.id)
+      this.row.tokens = null
+    }
+    if (scope === 'all' || scope === 'verifier') {
+      await clearVerifier(this.row.id)
+      await clearState(this.row.id)
+      this.row.codeVerifier = null
+    }
+  }
+
+  get rowId(): string {
+    return this.row.id
+  }
+}
+
+export async function loadPreregisteredClient(
+  serverId: string
+): Promise<PreregisteredClient | undefined> {
+  const [row] = await db
+    .select({
+      clientId: mcpServers.oauthClientId,
+      clientSecret: mcpServers.oauthClientSecret,
+    })
+    .from(mcpServers)
+    .where(eq(mcpServers.id, serverId))
+    .limit(1)
+  if (!row?.clientId) return undefined
+  let clientSecret: string | undefined
+  if (row.clientSecret) {
+    try {
+      const { decrypted } = await decryptSecret(row.clientSecret)
+      clientSecret = decrypted
+    } catch (error) {
+      logger.error('Failed to decrypt preregistered MCP OAuth client secret', {
+        serverId,
+        error: toError(error).message,
+      })
+      throw new Error('Failed to decrypt preregistered MCP OAuth client secret')
+    }
+  }
+  return { clientId: row.clientId, clientSecret }
+}
diff --git a/apps/sim/lib/mcp/oauth/revoke.ts b/apps/sim/lib/mcp/oauth/revoke.ts
new file mode 100644
index 00000000000..dc80065a65c
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/revoke.ts
@@ -0,0 +1,104 @@
+import { discoverOAuthServerInfo } from '@modelcontextprotocol/sdk/client/auth.js'
+import { db } from '@sim/db'
+import { mcpServers } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { eq } from 'drizzle-orm'
+import { decryptSecret } from '@/lib/core/security/encryption'
+import { loadOauthRow } from '@/lib/mcp/oauth/storage'
+
+const logger = createLogger('McpOauthRevoke')
+const REVOKE_TIMEOUT_MS = 5000
+
+/**
+ * Best-effort RFC 7009 revocation of tokens at the authorization server.
+ * Never throws — revocation is advisory and must not block disconnect/delete flows.
+ */
+export async function revokeMcpOauthTokens(mcpServerId: string): Promise<void> {
+  try {
+    const row = await loadOauthRow({ mcpServerId })
+    if (!row?.tokens) return
+
+    const [server] = await db
+      .select({
+        url: mcpServers.url,
+        oauthClientId: mcpServers.oauthClientId,
+        oauthClientSecret: mcpServers.oauthClientSecret,
+      })
+      .from(mcpServers)
+      .where(eq(mcpServers.id, mcpServerId))
+      .limit(1)
+    if (!server?.url) return
+
+    const info = await discoverOAuthServerInfo(server.url).catch(() => undefined)
+    const metadata = info?.authorizationServerMetadata as
+      | (Record<string, unknown> & { revocation_endpoint?: string })
+      | undefined
+    const revocationEndpoint = metadata?.revocation_endpoint
+    if (!revocationEndpoint) return
+
+    const clientInfo = row.clientInformation
+    const clientId = clientInfo?.client_id ?? server.oauthClientId ?? undefined
+    if (!clientId) return
+
+    let clientSecret = clientInfo?.client_secret
+    if (!clientSecret && server.oauthClientSecret) {
+      try {
+        const { decrypted } = await decryptSecret(server.oauthClientSecret)
+        clientSecret = decrypted
+      } catch {
+        clientSecret = undefined
+      }
+    }
+
+    const tokensToRevoke: Array<{ token: string; hint: 'refresh_token' | 'access_token' }> = []
+    if (row.tokens.refresh_token) {
+      tokensToRevoke.push({ token: row.tokens.refresh_token, hint: 'refresh_token' })
+    }
+    if (row.tokens.access_token) {
+      tokensToRevoke.push({ token: row.tokens.access_token, hint: 'access_token' })
+    }
+
+    for (const { token, hint } of tokensToRevoke) {
+      await postRevoke(revocationEndpoint, token, hint, clientId, clientSecret)
+    }
+  } catch (error) {
+    logger.warn(`Token revocation failed for server ${mcpServerId}`, {
+      error: toError(error).message,
+    })
+  }
+}
+
+async function postRevoke(
+  endpoint: string,
+  token: string,
+  hint: 'refresh_token' | 'access_token',
+  clientId: string,
+  clientSecret: string | undefined
+): Promise<void> {
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), REVOKE_TIMEOUT_MS)
+  try {
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      Accept: 'application/json',
+    }
+    const params = new URLSearchParams({ token, token_type_hint: hint })
+    if (clientSecret) {
+      headers.Authorization = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`
+    } else {
+      params.set('client_id', clientId)
+    }
+    const res = await fetch(endpoint, {
+      method: 'POST',
+      headers,
+      body: params.toString(),
+      signal: controller.signal,
+    })
+    if (!res.ok) {
+      logger.info(`Revocation returned ${res.status} for ${hint}; treating as best-effort`)
+    }
+  } finally {
+    clearTimeout(timer)
+  }
+}
diff --git a/apps/sim/lib/mcp/oauth/storage.test.ts b/apps/sim/lib/mcp/oauth/storage.test.ts
new file mode 100644
index 00000000000..95c7ae853c0
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/storage.test.ts
@@ -0,0 +1,94 @@
+/**
+ * @vitest-environment node
+ */
+import {
+  dbChainMock,
+  dbChainMockFns,
+  encryptionMock,
+  encryptionMockFns,
+  resetDbChainMock,
+  schemaMock,
+} from '@sim/testing'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('@sim/db', () => dbChainMock)
+vi.mock('@sim/db/schema', () => schemaMock)
+vi.mock('@/lib/core/security/encryption', () => encryptionMock)
+
+import { getOrCreateOauthRow, loadOauthRow, setOauthRowUser } from './storage'
+
+describe('MCP OAuth storage', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    resetDbChainMock()
+    encryptionMockFns.mockDecryptSecret.mockResolvedValue({ decrypted: '{}' })
+    encryptionMockFns.mockEncryptSecret.mockResolvedValue({
+      encrypted: 'encrypted',
+      iv: 'iv',
+    })
+  })
+
+  it('loads OAuth state by MCP server, independent of the requesting user', async () => {
+    dbChainMockFns.limit.mockResolvedValueOnce([
+      {
+        id: 'oauth-row-1',
+        mcpServerId: 'server-1',
+        userId: 'authorizer-1',
+        workspaceId: 'workspace-1',
+        clientInformation: null,
+        tokens: null,
+        codeVerifier: null,
+        state: null,
+        updatedAt: new Date(),
+      },
+    ])
+
+    const row = await loadOauthRow({ mcpServerId: 'server-1' })
+
+    expect(row).toMatchObject({
+      id: 'oauth-row-1',
+      mcpServerId: 'server-1',
+      userId: 'authorizer-1',
+      workspaceId: 'workspace-1',
+    })
+    expect(dbChainMockFns.limit).toHaveBeenCalledTimes(1)
+  })
+
+  it('reuses the existing workspace OAuth row instead of creating a per-user row', async () => {
+    dbChainMockFns.limit.mockResolvedValueOnce([
+      {
+        id: 'oauth-row-1',
+        mcpServerId: 'server-1',
+        userId: 'authorizer-1',
+        workspaceId: 'workspace-1',
+        clientInformation: null,
+        tokens: null,
+        codeVerifier: null,
+        state: null,
+        updatedAt: new Date(),
+      },
+    ])
+
+    const row = await getOrCreateOauthRow({
+      mcpServerId: 'server-1',
+      userId: 'different-user',
+      workspaceId: 'workspace-1',
+    })
+
+    expect(row.id).toBe('oauth-row-1')
+    expect(row.userId).toBe('authorizer-1')
+    expect(dbChainMockFns.insert).not.toHaveBeenCalled()
+  })
+
+  it('records the latest authorizing user without changing row ownership', async () => {
+    await setOauthRowUser('oauth-row-1', 'user-2')
+
+    expect(dbChainMockFns.update).toHaveBeenCalledTimes(1)
+    expect(dbChainMockFns.set).toHaveBeenCalledWith(
+      expect.objectContaining({
+        userId: 'user-2',
+        updatedAt: expect.any(Date),
+      })
+    )
+  })
+})
diff --git a/apps/sim/lib/mcp/oauth/storage.ts b/apps/sim/lib/mcp/oauth/storage.ts
new file mode 100644
index 00000000000..ee6ae0143ff
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/storage.ts
@@ -0,0 +1,249 @@
+import { createHash } from 'node:crypto'
+import type {
+  OAuthClientInformationMixed,
+  OAuthTokens,
+} from '@modelcontextprotocol/sdk/shared/auth.js'
+import { db } from '@sim/db'
+import { mcpServerOauth } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
+import { and, eq, gt } from 'drizzle-orm'
+import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
+
+const logger = createLogger('McpOauthStorage')
+
+function hashState(state: string): string {
+  return createHash('sha256').update(state).digest('hex')
+}
+
+const STATE_TTL_MS = 10 * 60 * 1000
+
+export interface McpOauthRow {
+  id: string
+  mcpServerId: string
+  userId: string | null
+  workspaceId: string
+  clientInformation: OAuthClientInformationMixed | null
+  tokens: OAuthTokens | null
+  codeVerifier: string | null
+  state: string | null
+  stateCreatedAt: Date | null
+  updatedAt: Date
+}
+
+async function encryptTokens(tokens: OAuthTokens): Promise<string> {
+  const { encrypted } = await encryptSecret(JSON.stringify(tokens))
+  return encrypted
+}
+
+async function encryptClientInformation(info: OAuthClientInformationMixed): Promise<string> {
+  const { encrypted } = await encryptSecret(JSON.stringify(info))
+  return encrypted
+}
+
+/**
+ * Returns `null` and clears the column when decryption fails (e.g. key rotation)
+ * so the next call triggers a fresh OAuth flow instead of a 500.
+ */
+async function safeDecrypt<T>(
+  rowId: string,
+  column: 'tokens' | 'clientInformation' | 'codeVerifier',
+  encrypted: string,
+  decode: (decrypted: string) => T
+): Promise<T | null> {
+  try {
+    const { decrypted } = await decryptSecret(encrypted)
+    return decode(decrypted)
+  } catch (error) {
+    logger.warn(`Failed to decrypt ${column} for OAuth row ${rowId}; clearing column`, {
+      error: toError(error).message,
+    })
+    await db
+      .update(mcpServerOauth)
+      .set({ [column]: null, updatedAt: new Date() })
+      .where(eq(mcpServerOauth.id, rowId))
+    return null
+  }
+}
+
+export async function getOrCreateOauthRow(params: {
+  mcpServerId: string
+  userId: string
+  workspaceId: string
+}): Promise<McpOauthRow> {
+  const existing = await loadOauthRow(params)
+  if (existing) return existing
+
+  const id = generateId()
+  try {
+    await db.insert(mcpServerOauth).values({
+      id,
+      mcpServerId: params.mcpServerId,
+      userId: params.userId,
+      workspaceId: params.workspaceId,
+    })
+  } catch (error) {
+    const winner = await loadOauthRow(params)
+    if (winner) return winner
+    throw error
+  }
+
+  return {
+    id,
+    mcpServerId: params.mcpServerId,
+    userId: params.userId,
+    workspaceId: params.workspaceId,
+    clientInformation: null,
+    tokens: null,
+    codeVerifier: null,
+    state: null,
+    stateCreatedAt: null,
+    updatedAt: new Date(),
+  }
+}
+
+type RawOauthRow = typeof mcpServerOauth.$inferSelect
+
+async function mapOauthRow(row: RawOauthRow): Promise<McpOauthRow> {
+  return {
+    id: row.id,
+    mcpServerId: row.mcpServerId,
+    userId: row.userId,
+    workspaceId: row.workspaceId,
+    clientInformation: row.clientInformation
+      ? await safeDecrypt(
+          row.id,
+          'clientInformation',
+          row.clientInformation,
+          (d) => JSON.parse(d) as OAuthClientInformationMixed
+        )
+      : null,
+    tokens: row.tokens
+      ? await safeDecrypt(row.id, 'tokens', row.tokens, (d) => JSON.parse(d) as OAuthTokens)
+      : null,
+    codeVerifier: row.codeVerifier
+      ? await safeDecrypt(row.id, 'codeVerifier', row.codeVerifier, (d) => d)
+      : null,
+    state: row.state,
+    stateCreatedAt: row.stateCreatedAt,
+    updatedAt: row.updatedAt,
+  }
+}
+
+export async function loadOauthRow(params: { mcpServerId: string }): Promise<McpOauthRow | null> {
+  const [row] = await db
+    .select()
+    .from(mcpServerOauth)
+    .where(eq(mcpServerOauth.mcpServerId, params.mcpServerId))
+    .limit(1)
+  if (!row) return null
+  return mapOauthRow(row)
+}
+
+export async function setOauthRowUser(rowId: string, userId: string): Promise<void> {
+  await db
+    .update(mcpServerOauth)
+    .set({ userId, updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function loadOauthRowByState(state: string): Promise<McpOauthRow | null> {
+  const [row] = await db
+    .select()
+    .from(mcpServerOauth)
+    .where(
+      and(
+        eq(mcpServerOauth.state, hashState(state)),
+        gt(mcpServerOauth.stateCreatedAt, new Date(Date.now() - STATE_TTL_MS))
+      )
+    )
+    .limit(1)
+  if (!row) return null
+  return mapOauthRow(row)
+}
+
+export async function saveClientInformation(
+  rowId: string,
+  info: OAuthClientInformationMixed
+): Promise<void> {
+  const encrypted = await encryptClientInformation(info)
+  await db
+    .update(mcpServerOauth)
+    .set({ clientInformation: encrypted, updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function saveTokens(rowId: string, tokens: OAuthTokens): Promise<void> {
+  const encrypted = await encryptTokens(tokens)
+  await db
+    .update(mcpServerOauth)
+    .set({ tokens: encrypted, lastRefreshedAt: new Date(), updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function saveCodeVerifier(rowId: string, verifier: string): Promise<void> {
+  const { encrypted } = await encryptSecret(verifier)
+  await db
+    .update(mcpServerOauth)
+    .set({ codeVerifier: encrypted, updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function saveState(rowId: string, state: string): Promise<void> {
+  const now = new Date()
+  await db
+    .update(mcpServerOauth)
+    .set({ state: hashState(state), stateCreatedAt: now, updatedAt: now })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function clearTokens(rowId: string): Promise<void> {
+  await db
+    .update(mcpServerOauth)
+    .set({ tokens: null, updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function clearClient(rowId: string): Promise<void> {
+  await db
+    .update(mcpServerOauth)
+    .set({ clientInformation: null, updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function clearVerifier(rowId: string): Promise<void> {
+  await db
+    .update(mcpServerOauth)
+    .set({ codeVerifier: null, updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+export async function clearState(rowId: string): Promise<void> {
+  await db
+    .update(mcpServerOauth)
+    .set({ state: null, stateCreatedAt: null, updatedAt: new Date() })
+    .where(eq(mcpServerOauth.id, rowId))
+}
+
+/**
+ * Per-process serialization for an OAuth row. Refresh tokens rotate (RFC 6749 §6,
+ * MCP §2.3.3), so two concurrent refreshes against the same row would race and one
+ * would receive `invalid_grant`, wiping the credentials. We serialize SDK calls
+ * that may trigger a refresh on a per-row basis.
+ */
+const refreshLocks = new Map<string, Promise<unknown>>()
+
+export async function withMcpOauthRefreshLock<T>(rowId: string, fn: () => Promise<T>): Promise<T> {
+  const prev = refreshLocks.get(rowId) ?? Promise.resolve()
+  // Wait for the predecessor to settle (success or failure), discard its
+  // value/error, then run fn. Each caller awaits its own fn's outcome — errors
+  // do not propagate across callers in the chain.
+  const next = prev.catch(() => undefined).then(() => fn())
+  refreshLocks.set(rowId, next)
+  const cleanup = () => {
+    if (refreshLocks.get(rowId) === next) refreshLocks.delete(rowId)
+  }
+  next.then(cleanup, cleanup)
+  return next
+}
diff --git a/apps/sim/lib/mcp/oauth/url-validation.ts b/apps/sim/lib/mcp/oauth/url-validation.ts
new file mode 100644
index 00000000000..81292bbe630
--- /dev/null
+++ b/apps/sim/lib/mcp/oauth/url-validation.ts
@@ -0,0 +1,25 @@
+import { isLoopbackHostname } from '@/lib/core/utils/urls'
+
+export class McpOauthInsecureUrlError extends Error {
+  constructor(url: string) {
+    super(`MCP OAuth requires https for non-loopback hosts: ${url}`)
+    this.name = 'McpOauthInsecureUrlError'
+  }
+}
+
+/**
+ * MCP spec §2.1 and RFC 8252 §7.3: OAuth flows must run over https, with
+ * http allowed only for loopback addresses during local development.
+ */
+export function assertSafeOauthServerUrl(rawUrl: string | null | undefined): URL {
+  if (!rawUrl) throw new McpOauthInsecureUrlError(String(rawUrl))
+  let parsed: URL
+  try {
+    parsed = new URL(rawUrl)
+  } catch {
+    throw new McpOauthInsecureUrlError(rawUrl)
+  }
+  if (parsed.protocol === 'https:') return parsed
+  if (parsed.protocol === 'http:' && isLoopbackHostname(parsed.hostname)) return parsed
+  throw new McpOauthInsecureUrlError(rawUrl)
+}
diff --git a/apps/sim/lib/mcp/orchestration/server-lifecycle.ts b/apps/sim/lib/mcp/orchestration/server-lifecycle.ts
index 1d05c50119f..1a11e97484f 100644
--- a/apps/sim/lib/mcp/orchestration/server-lifecycle.ts
+++ b/apps/sim/lib/mcp/orchestration/server-lifecycle.ts
@@ -1,9 +1,11 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db, mcpServers } from '@sim/db'
+import { mcpServerOauth } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { and, eq, isNull } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
+import { encryptSecret } from '@/lib/core/security/encryption'
 import {
   McpDnsResolutionError,
   McpDomainNotAllowedError,
@@ -11,7 +13,9 @@ import {
   validateMcpDomain,
   validateMcpServerSsrf,
 } from '@/lib/mcp/domain-check'
+import { detectMcpAuthType, oauthCredsChanged, revokeMcpOauthTokens } from '@/lib/mcp/oauth'
 import { mcpService } from '@/lib/mcp/service'
+import type { McpAuthType } from '@/lib/mcp/types'
 import { generateMcpServerId } from '@/lib/mcp/utils'
 import { captureServerEvent } from '@/lib/posthog/server'
 
@@ -39,6 +43,11 @@ export interface PerformCreateMcpServerParams extends ActorMetadata {
   retries?: number
   enabled?: boolean
   source?: string
+  authType?: McpAuthType
+  oauthClientId?: string | null
+  oauthClientIdProvided?: boolean
+  oauthClientSecret?: string | null
+  oauthClientSecretProvided?: boolean
 }
 
 export interface PerformUpdateMcpServerParams extends ActorMetadata {
@@ -53,6 +62,11 @@ export interface PerformUpdateMcpServerParams extends ActorMetadata {
   timeout?: number
   retries?: number
   enabled?: boolean
+  authType?: McpAuthType
+  oauthClientId?: string | null
+  oauthClientIdProvided?: boolean
+  oauthClientSecret?: string | null
+  oauthClientSecretProvided?: boolean
 }
 
 export interface PerformDeleteMcpServerParams extends ActorMetadata {
@@ -69,6 +83,7 @@ export interface PerformMcpServerResult {
   serverId?: string
   server?: typeof mcpServers.$inferSelect
   updated?: boolean
+  authType?: McpAuthType
 }
 
 async function validateMcpServerUrl(url: string): Promise<PerformMcpServerResult | null> {
@@ -99,34 +114,92 @@ export async function performCreateMcpServer(
   const enabled = params.enabled !== false
   const serverId = params.url ? generateMcpServerId(params.workspaceId, params.url) : generateId()
 
+  const oauthClientSecretEncrypted = params.oauthClientSecret
+    ? (await encryptSecret(params.oauthClientSecret)).encrypted
+    : null
+  const oauthClientId = params.oauthClientId || null
+  const hasHeaders = params.headers && Object.keys(params.headers).length > 0
+
   try {
     const [existingServer] = await db
-      .select({ id: mcpServers.id, deletedAt: mcpServers.deletedAt })
+      .select({
+        id: mcpServers.id,
+        deletedAt: mcpServers.deletedAt,
+        url: mcpServers.url,
+        authType: mcpServers.authType,
+        oauthClientId: mcpServers.oauthClientId,
+        oauthClientSecret: mcpServers.oauthClientSecret,
+      })
       .from(mcpServers)
       .where(and(eq(mcpServers.id, serverId), eq(mcpServers.workspaceId, params.workspaceId)))
       .limit(1)
 
+    const urlChanged = existingServer ? existingServer.url !== params.url : true
+
+    let resolvedAuthType: McpAuthType = params.authType ?? 'headers'
+    if (!params.authType) {
+      if (existingServer && !urlChanged) {
+        resolvedAuthType = (existingServer.authType ?? 'headers') as McpAuthType
+      } else if (params.url && !hasHeaders) {
+        try {
+          resolvedAuthType = await detectMcpAuthType(params.url)
+        } catch (e) {
+          logger.warn('Probe failed, defaulting to headers', { url: params.url, error: e })
+          resolvedAuthType = 'headers'
+        }
+      }
+    }
+    if (params.oauthClientId) resolvedAuthType = 'oauth'
+
     if (existingServer) {
-      await db
-        .update(mcpServers)
-        .set({
+      const credsChanged = await oauthCredsChanged({
+        incomingClientId: oauthClientId,
+        incomingClientIdProvided: params.oauthClientIdProvided ?? false,
+        incomingClientSecret: params.oauthClientSecret,
+        incomingClientSecretProvided: params.oauthClientSecretProvided ?? false,
+        currentClientId: existingServer.oauthClientId,
+        currentEncryptedClientSecret: existingServer.oauthClientSecret,
+      })
+      const isRevival = existingServer.deletedAt !== null
+      const shouldClearOauth = urlChanged || credsChanged || isRevival
+
+      if (shouldClearOauth) await revokeMcpOauthTokens(serverId)
+
+      await db.transaction(async (tx) => {
+        if (shouldClearOauth) {
+          await tx.delete(mcpServerOauth).where(eq(mcpServerOauth.mcpServerId, serverId))
+        }
+        const updateValues: Record<string, unknown> = {
           name: params.name,
           description: params.description,
           transport,
           url: params.url,
+          authType: resolvedAuthType,
           headers: params.headers || {},
           timeout,
           retries,
           enabled,
-          connectionStatus: 'connected',
-          lastConnected: new Date(),
           updatedAt: new Date(),
           deletedAt: null,
-        })
-        .where(eq(mcpServers.id, serverId))
+        }
+        if (resolvedAuthType === 'oauth') {
+          if (shouldClearOauth) {
+            updateValues.connectionStatus = 'disconnected'
+            updateValues.lastConnected = null
+          }
+        } else {
+          updateValues.connectionStatus = 'connected'
+          updateValues.lastConnected = new Date()
+        }
+        if (params.oauthClientIdProvided) updateValues.oauthClientId = oauthClientId
+        if (params.oauthClientSecretProvided) {
+          updateValues.oauthClientSecret = oauthClientSecretEncrypted
+        }
+        await tx.update(mcpServers).set(updateValues).where(eq(mcpServers.id, serverId))
+      })
 
       await mcpService.clearCache(params.workspaceId)
-      return { success: true, serverId, updated: true }
+      return { success: true, serverId, updated: true, authType: resolvedAuthType }
     }
 
     await db.insert(mcpServers).values({
@@ -137,12 +210,15 @@ export async function performCreateMcpServer(
       description: params.description,
       transport,
       url: params.url,
+      authType: resolvedAuthType,
+      oauthClientId,
+      oauthClientSecret: oauthClientSecretEncrypted,
       headers: params.headers || {},
       timeout,
       retries,
       enabled,
-      connectionStatus: 'connected',
-      lastConnected: new Date(),
+      connectionStatus: resolvedAuthType === 'oauth' ? 'disconnected' : 'connected',
+      lastConnected: resolvedAuthType === 'oauth' ? null : new Date(),
       createdAt: new Date(),
       updatedAt: new Date(),
     })
@@ -193,7 +269,7 @@ export async function performCreateMcpServer(
       request: params.request,
     })
 
-    return { success: true, serverId, updated: false }
+    return { success: true, serverId, updated: false, authType: resolvedAuthType }
   } catch (error) {
     logger.error('Failed to create MCP server', { error })
     return { success: false, error: 'Failed to register MCP server', errorCode: 'internal' }
@@ -208,6 +284,11 @@ export async function performUpdateMcpServer(
     if (validation) return validation
   }
 
+  const oauthClientSecretEncrypted =
+    params.oauthClientSecretProvided && params.oauthClientSecret
+      ? (await encryptSecret(params.oauthClientSecret)).encrypted
+      : null
+
   const updateData: Partial<typeof mcpServers.$inferInsert> = { updatedAt: new Date() }
   if (params.name !== undefined) updateData.name = params.name
   if (params.description !== undefined) updateData.description = params.description
@@ -217,10 +298,20 @@ export async function performUpdateMcpServer(
   if (params.timeout !== undefined) updateData.timeout = params.timeout
   if (params.retries !== undefined) updateData.retries = params.retries
   if (params.enabled !== undefined) updateData.enabled = params.enabled
+  if (params.authType !== undefined) updateData.authType = params.authType
+  if (params.oauthClientIdProvided) updateData.oauthClientId = params.oauthClientId || null
+  if (params.oauthClientSecretProvided) {
+    updateData.oauthClientSecret = oauthClientSecretEncrypted
+  }
 
   try {
     const [currentServer] = await db
-      .select({ url: mcpServers.url })
+      .select({
+        url: mcpServers.url,
+        authType: mcpServers.authType,
+        oauthClientId: mcpServers.oauthClientId,
+        oauthClientSecret: mcpServers.oauthClientSecret,
+      })
       .from(mcpServers)
       .where(
         and(
@@ -231,22 +322,60 @@ export async function performUpdateMcpServer(
       )
       .limit(1)
 
-    const [server] = await db
-      .update(mcpServers)
-      .set(updateData)
-      .where(
-        and(
-          eq(mcpServers.id, params.serverId),
-          eq(mcpServers.workspaceId, params.workspaceId),
-          isNull(mcpServers.deletedAt)
+    if (!currentServer) return { success: false, error: 'Server not found', errorCode: 'not_found' }
+
+    if (
+      params.oauthClientId &&
+      currentServer.authType !== 'oauth' &&
+      updateData.authType === undefined
+    ) {
+      updateData.authType = 'oauth'
+    }
+
+    const urlChanged = params.url !== undefined && currentServer.url !== params.url
+    const credsChanged = await oauthCredsChanged({
+      incomingClientId: params.oauthClientId,
+      incomingClientIdProvided: params.oauthClientIdProvided ?? false,
+      incomingClientSecret: params.oauthClientSecret,
+      incomingClientSecretProvided: params.oauthClientSecretProvided ?? false,
+      currentClientId: currentServer.oauthClientId,
+      currentEncryptedClientSecret: currentServer.oauthClientSecret,
+    })
+    const shouldClearOauth = urlChanged || credsChanged
+    const resolvedAuthType = (updateData.authType ?? currentServer.authType) as McpAuthType
+    if (shouldClearOauth && resolvedAuthType === 'oauth') {
+      updateData.connectionStatus = 'disconnected'
+      updateData.lastConnected = null
+    }
+
+    if (shouldClearOauth) await revokeMcpOauthTokens(params.serverId)
+
+    const server = await db.transaction(async (tx) => {
+      const [updated] = await tx
+        .update(mcpServers)
+        .set(updateData)
+        .where(
+          and(
+            eq(mcpServers.id, params.serverId),
+            eq(mcpServers.workspaceId, params.workspaceId),
+            isNull(mcpServers.deletedAt)
+          )
         )
-      )
-      .returning()
+        .returning()
+
+      if (!updated) return null
+
+      if (shouldClearOauth) {
+        await tx.delete(mcpServerOauth).where(eq(mcpServerOauth.mcpServerId, params.serverId))
+      }
+      return updated
+    })
 
     if (!server) return { success: false, error: 'Server not found', errorCode: 'not_found' }
 
     const shouldClearCache =
-      (params.url !== undefined && currentServer?.url !== params.url) ||
+      urlChanged ||
+      credsChanged ||
       params.enabled !== undefined ||
       params.headers !== undefined ||
       params.timeout !== undefined ||
@@ -284,6 +413,7 @@ export async function performDeleteMcpServer(
   params: PerformDeleteMcpServerParams
 ): Promise<PerformMcpServerResult> {
   try {
+    await revokeMcpOauthTokens(params.serverId)
     const [server] = await db
       .delete(mcpServers)
       .where(
diff --git a/apps/sim/lib/mcp/service.ts b/apps/sim/lib/mcp/service.ts
index 7838f682822..1c3c2fd291a 100644
--- a/apps/sim/lib/mcp/service.ts
+++ b/apps/sim/lib/mcp/service.ts
@@ -2,10 +2,12 @@
  * MCP Service - Clean stateless service for MCP operations
  */
 
+import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js'
+import { StreamableHTTPError } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
 import { db } from '@sim/db'
 import { mcpServers } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { getErrorMessage, toError } from '@sim/utils/errors'
+import { getErrorMessage } from '@sim/utils/errors'
 import { sleep } from '@sim/utils/helpers'
 import { and, eq, isNull } from 'drizzle-orm'
 import { isTest } from '@/lib/core/config/feature-flags'
@@ -17,20 +19,27 @@ import {
   validateMcpDomain,
   validateMcpServerSsrf,
 } from '@/lib/mcp/domain-check'
+import {
+  getOrCreateOauthRow,
+  loadPreregisteredClient,
+  SimMcpOauthProvider,
+  withMcpOauthRefreshLock,
+} from '@/lib/mcp/oauth'
 import { resolveMcpConfigEnvVars } from '@/lib/mcp/resolve-config'
 import {
   createMcpCacheAdapter,
   getMcpCacheType,
   type McpCacheStorageAdapter,
 } from '@/lib/mcp/storage'
-import type {
-  McpServerConfig,
-  McpServerStatusConfig,
-  McpServerSummary,
-  McpTool,
-  McpToolCall,
-  McpToolResult,
-  McpTransport,
+import {
+  McpOauthAuthorizationRequiredError,
+  type McpServerConfig,
+  type McpServerStatusConfig,
+  type McpServerSummary,
+  type McpTool,
+  type McpToolCall,
+  type McpToolResult,
+  type McpTransport,
 } from '@/lib/mcp/types'
 import { MCP_CONSTANTS } from '@/lib/mcp/utils'
 
@@ -112,6 +121,8 @@ class McpService {
       description: server.description || undefined,
       transport: 'streamable-http' as const,
       url: server.url || undefined,
+      authType: (server.authType as McpServerConfig['authType']) ?? 'headers',
+      workspaceId: server.workspaceId,
       headers: (server.headers as Record<string, string>) || {},
       timeout: server.timeout || 30000,
       retries: server.retries || 3,
@@ -143,6 +154,8 @@ class McpService {
         description: server.description || undefined,
         transport: server.transport as McpTransport,
         url: server.url || undefined,
+        authType: (server.authType as McpServerConfig['authType']) ?? 'headers',
+        workspaceId: server.workspaceId,
         headers: (server.headers as Record<string, string>) || {},
         timeout: server.timeout || 30000,
         retries: server.retries || 3,
@@ -158,7 +171,8 @@ class McpService {
    */
   private async createClient(
     config: McpServerConfig,
-    resolvedIP: string | null
+    resolvedIP: string | null,
+    userId?: string
   ): Promise<McpClient> {
     const securityPolicy = {
       requireConsent: true,
@@ -167,13 +181,46 @@ class McpService {
       allowedOrigins: config.url ? [new URL(config.url).origin] : undefined,
     }
 
-    const client = new McpClient({
-      config,
-      securityPolicy,
-      resolvedIP: resolvedIP ?? undefined,
+    if (config.authType !== 'oauth') {
+      const client = new McpClient({
+        config,
+        securityPolicy,
+        resolvedIP: resolvedIP ?? undefined,
+      })
+      await client.connect()
+      return client
+    }
+
+    if (!userId || !config.workspaceId) {
+      throw new Error('OAuth MCP server requires both userId and workspaceId')
+    }
+    const workspaceId = config.workspaceId
+
+    // Load the row inside the refresh lock so concurrent callers observe tokens
+    // written by a predecessor refresh, rather than a stale snapshot. Without
+    // this, the second caller's provider would hold a rotated-out refresh token
+    // and the SDK would trip `invalid_grant`. The lock is keyed on serverId
+    // since the row is per-server.
+    return withMcpOauthRefreshLock(config.id, async () => {
+      const row = await getOrCreateOauthRow({
+        mcpServerId: config.id,
+        userId,
+        workspaceId,
+      })
+      if (!row.tokens) {
+        throw new McpOauthAuthorizationRequiredError(config.id, config.name)
+      }
+      const preregistered = await loadPreregisteredClient(config.id)
+      const authProvider = new SimMcpOauthProvider({ row, preregistered })
+      const client = new McpClient({
+        config,
+        securityPolicy,
+        authProvider,
+        resolvedIP: resolvedIP ?? undefined,
+      })
+      await client.connect()
+      return client
     })
-    await client.connect()
-    return client
   }
 
   /**
@@ -209,7 +256,7 @@ class McpService {
         if (extraHeaders && Object.keys(extraHeaders).length > 0) {
           resolvedConfig.headers = { ...resolvedConfig.headers, ...extraHeaders }
         }
-        const client = await this.createClient(resolvedConfig, resolvedIP)
+        const client = await this.createClient(resolvedConfig, resolvedIP, userId)
 
         try {
           const result = await client.callTool(toolCall)
@@ -235,17 +282,16 @@ class McpService {
   }
 
   /**
-   * Check if an error indicates a session-related issue that might be resolved by retry
+   * Detects an expired or unknown `Mcp-Session-Id` so the caller can retry.
+   * Per MCP spec, the server returns HTTP 404 for an unknown session id and
+   * may return 400 when the session header is malformed; the SDK surfaces
+   * both as `StreamableHTTPError` with a typed numeric `code` field.
    */
   private isSessionError(error: unknown): boolean {
-    const message = toError(error).message
-    const lowerMessage = message.toLowerCase()
-    return (
-      lowerMessage.includes('session') ||
-      lowerMessage.includes('400') ||
-      lowerMessage.includes('404') ||
-      lowerMessage.includes('no valid session')
-    )
+    if (error instanceof StreamableHTTPError) {
+      return error.code === 404 || error.code === 400
+    }
+    return false
   }
 
   /**
@@ -364,7 +410,7 @@ class McpService {
             userId,
             workspaceId
           )
-          const client = await this.createClient(resolvedConfig, resolvedIP)
+          const client = await this.createClient(resolvedConfig, resolvedIP, userId)
           try {
             const tools = await client.listTools()
             logger.debug(
@@ -393,6 +439,27 @@ class McpService {
               result.value.tools.length
             )
           )
+        } else if (
+          result.reason instanceof McpOauthAuthorizationRequiredError ||
+          result.reason instanceof UnauthorizedError
+        ) {
+          // Force 'disconnected' so the settings UI surfaces the re-auth button
+          // instead of a stale 'connected' state when refresh has expired.
+          logger.info(`[${requestId}] Skipping server ${server.name}: OAuth authorization pending`)
+          statusUpdates.push(
+            db
+              .update(mcpServers)
+              .set({
+                connectionStatus: 'disconnected',
+                lastError: null,
+                updatedAt: new Date(),
+              })
+              .where(eq(mcpServers.id, server.id!))
+              .then(() => undefined)
+              .catch((err) => {
+                logger.warn(`[${requestId}] Failed to mark server ${server.id} disconnected:`, err)
+              })
+          )
         } else {
           failedCount++
           const errorMessage = getErrorMessage(result.reason, 'Unknown error')
@@ -472,7 +539,7 @@ class McpService {
           userId,
           workspaceId
         )
-        const client = await this.createClient(resolvedConfig, resolvedIP)
+        const client = await this.createClient(resolvedConfig, resolvedIP, userId)
 
         try {
           const tools = await client.listTools()
@@ -516,7 +583,7 @@ class McpService {
             userId,
             workspaceId
           )
-          const client = await this.createClient(resolvedConfig, resolvedIP)
+          const client = await this.createClient(resolvedConfig, resolvedIP, userId)
           const tools = await client.listTools()
           await client.disconnect()
 
@@ -531,6 +598,22 @@ class McpService {
             error: undefined,
           })
         } catch (error) {
+          if (
+            error instanceof McpOauthAuthorizationRequiredError ||
+            error instanceof UnauthorizedError
+          ) {
+            summaries.push({
+              id: config.id,
+              name: config.name,
+              url: config.url,
+              transport: config.transport,
+              status: 'disconnected',
+              toolCount: 0,
+              lastSeen: undefined,
+              error: undefined,
+            })
+            continue
+          }
           summaries.push({
             id: config.id,
             name: config.name,
diff --git a/apps/sim/lib/mcp/types.ts b/apps/sim/lib/mcp/types.ts
index f4f5c939efd..1cb4ad3e782 100644
--- a/apps/sim/lib/mcp/types.ts
+++ b/apps/sim/lib/mcp/types.ts
@@ -4,6 +4,14 @@
 
 export type McpTransport = 'streamable-http'
 
+/**
+ * Auth mode for an outbound MCP server connection.
+ * - `none`   — server requires no auth.
+ * - `headers` — static header map (legacy / API-token / bearer).
+ * - `oauth`  — OAuth 2.1 + PKCE via the SDK's authProvider, persisted per workspace server.
+ */
+export type McpAuthType = 'none' | 'headers' | 'oauth'
+
 export interface McpServerStatusConfig {
   consecutiveFailures: number
   lastSuccessfulDiscovery: string | null
@@ -15,6 +23,13 @@ export interface McpServerConfig {
   description?: string
   transport: McpTransport
   url?: string
+  authType?: McpAuthType
+  /**
+   * Required when `authType === 'oauth'` — identifies whose stored tokens
+   * to use when establishing the connection. Omit for header / none auth.
+   */
+  userId?: string
+  workspaceId?: string
   headers?: Record<string, string>
   timeout?: number
   retries?: number
@@ -136,6 +151,22 @@ export class McpConnectionError extends McpError {
   }
 }
 
+/**
+ * Thrown when an OAuth-protected MCP server is reachable but the current
+ * user has not yet authorized Sim. This is a benign "pending" state, not a
+ * connection failure — callers should surface a re-auth prompt rather than
+ * marking the server as errored.
+ */
+export class McpOauthAuthorizationRequiredError extends McpError {
+  constructor(
+    public readonly serverId: string,
+    serverName: string
+  ) {
+    super(`OAuth authorization required for "${serverName}"`)
+    this.name = 'McpOauthAuthorizationRequiredError'
+  }
+}
+
 export interface McpServerSummary {
   id: string
   name: string
@@ -169,6 +200,13 @@ export interface McpClientOptions {
    * just validated the URL via `validateMcpServerSsrf`.
    */
   resolvedIP?: string
+  /**
+   * SDK-compatible OAuth client provider. When provided, the underlying
+   * StreamableHTTPClientTransport delegates token discovery, refresh, and
+   * 401 recovery to it. Should be supplied for `authType === 'oauth'`
+   * server configs.
+   */
+  authProvider?: import('@modelcontextprotocol/sdk/client/auth.js').OAuthClientProvider
 }
 
 /**
diff --git a/apps/sim/lib/mcp/workflow-tool-schema.ts b/apps/sim/lib/mcp/workflow-tool-schema.ts
index 3f3a852052a..8ceab6e26dd 100644
--- a/apps/sim/lib/mcp/workflow-tool-schema.ts
+++ b/apps/sim/lib/mcp/workflow-tool-schema.ts
@@ -8,7 +8,7 @@ import type { McpToolSchema } from './types'
  * Extended property definition for workflow tool schemas.
  * More specific than the generic McpToolSchema properties.
  */
-interface McpToolProperty {
+export interface McpToolProperty {
   [key: string]: unknown
   type: string
   description?: string
@@ -24,7 +24,7 @@ export interface McpToolInputSchema extends McpToolSchema {
   properties: Record<string, McpToolProperty>
 }
 
-interface McpToolDefinition {
+export interface McpToolDefinition {
   name: string
   description: string
   inputSchema: McpToolInputSchema
diff --git a/packages/db/migrations/0210_mcp_oauth.sql b/packages/db/migrations/0210_mcp_oauth.sql
new file mode 100644
index 00000000000..78cae01327a
--- /dev/null
+++ b/packages/db/migrations/0210_mcp_oauth.sql
@@ -0,0 +1,23 @@
+CREATE TABLE "mcp_server_oauth" (
+	"id" text PRIMARY KEY NOT NULL,
+	"mcp_server_id" text NOT NULL,
+	"user_id" text,
+	"workspace_id" text NOT NULL,
+	"client_information" text,
+	"tokens" text,
+	"code_verifier" text,
+	"state" text,
+	"state_created_at" timestamp,
+	"last_refreshed_at" timestamp,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "mcp_servers" ADD COLUMN "auth_type" text DEFAULT 'headers' NOT NULL;--> statement-breakpoint
+ALTER TABLE "mcp_servers" ADD COLUMN "oauth_client_id" text;--> statement-breakpoint
+ALTER TABLE "mcp_servers" ADD COLUMN "oauth_client_secret" text;--> statement-breakpoint
+ALTER TABLE "mcp_server_oauth" ADD CONSTRAINT "mcp_server_oauth_mcp_server_id_mcp_servers_id_fk" FOREIGN KEY ("mcp_server_id") REFERENCES "public"."mcp_servers"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "mcp_server_oauth" ADD CONSTRAINT "mcp_server_oauth_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "mcp_server_oauth" ADD CONSTRAINT "mcp_server_oauth_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE UNIQUE INDEX "mcp_server_oauth_server_unique" ON "mcp_server_oauth" USING btree ("mcp_server_id");--> statement-breakpoint
+CREATE INDEX "mcp_server_oauth_state_idx" ON "mcp_server_oauth" USING btree ("state");
\ No newline at end of file
diff --git a/packages/db/migrations/meta/0210_snapshot.json b/packages/db/migrations/meta/0210_snapshot.json
new file mode 100644
index 00000000000..f27a15ef58f
--- /dev/null
+++ b/packages/db/migrations/meta/0210_snapshot.json
@@ -0,0 +1,16596 @@
+{
+  "id": "0a966f65-38de-4bb8-966b-f5a99b39acb1",
+  "prevId": "77be6741-7a6f-4e72-8be1-54fa58eee8e3",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.a2a_agent": {
+      "name": "a2a_agent",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'1.0.0'"
+        },
+        "capabilities": {
+          "name": "capabilities",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "skills": {
+          "name": "skills",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "authentication": {
+          "name": "authentication",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "signatures": {
+          "name": "signatures",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "is_published": {
+          "name": "is_published",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "published_at": {
+          "name": "published_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "a2a_agent_workflow_id_idx": {
+          "name": "a2a_agent_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_created_by_idx": {
+          "name": "a2a_agent_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_workspace_workflow_unique": {
+          "name": "a2a_agent_workspace_workflow_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"a2a_agent\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_archived_at_idx": {
+          "name": "a2a_agent_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_workspace_archived_partial_idx": {
+          "name": "a2a_agent_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"a2a_agent\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_agent_workspace_id_workspace_id_fk": {
+          "name": "a2a_agent_workspace_id_workspace_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "a2a_agent_workflow_id_workflow_id_fk": {
+          "name": "a2a_agent_workflow_id_workflow_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "a2a_agent_created_by_user_id_fk": {
+          "name": "a2a_agent_created_by_user_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.a2a_push_notification_config": {
+      "name": "a2a_push_notification_config",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "auth_schemes": {
+          "name": "auth_schemes",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "auth_credentials": {
+          "name": "auth_credentials",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "a2a_push_notification_config_task_unique": {
+          "name": "a2a_push_notification_config_task_unique",
+          "columns": [
+            {
+              "expression": "task_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_push_notification_config_task_id_a2a_task_id_fk": {
+          "name": "a2a_push_notification_config_task_id_a2a_task_id_fk",
+          "tableFrom": "a2a_push_notification_config",
+          "tableTo": "a2a_task",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.a2a_task": {
+      "name": "a2a_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "agent_id": {
+          "name": "agent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "a2a_task_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'submitted'"
+        },
+        "messages": {
+          "name": "messages",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "artifacts": {
+          "name": "artifacts",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "a2a_task_agent_id_idx": {
+          "name": "a2a_task_agent_id_idx",
+          "columns": [
+            {
+              "expression": "agent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_session_id_idx": {
+          "name": "a2a_task_session_id_idx",
+          "columns": [
+            {
+              "expression": "session_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_status_idx": {
+          "name": "a2a_task_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_execution_id_idx": {
+          "name": "a2a_task_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_created_at_idx": {
+          "name": "a2a_task_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_task_agent_id_a2a_agent_id_fk": {
+          "name": "a2a_task_agent_id_a2a_agent_id_fk",
+          "tableFrom": "a2a_task",
+          "tableTo": "a2a_agent",
+          "columnsFrom": ["agent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.academy_certificate": {
+      "name": "academy_certificate",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "academy_cert_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "issued_at": {
+          "name": "issued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "certificate_number": {
+          "name": "certificate_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "academy_certificate_user_id_idx": {
+          "name": "academy_certificate_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_course_id_idx": {
+          "name": "academy_certificate_course_id_idx",
+          "columns": [
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_user_course_unique": {
+          "name": "academy_certificate_user_course_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_number_idx": {
+          "name": "academy_certificate_number_idx",
+          "columns": [
+            {
+              "expression": "certificate_number",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_status_idx": {
+          "name": "academy_certificate_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "academy_certificate_user_id_user_id_fk": {
+          "name": "academy_certificate_user_id_user_id_fk",
+          "tableFrom": "academy_certificate",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "academy_certificate_certificate_number_unique": {
+          "name": "academy_certificate_certificate_number_unique",
+          "nullsNotDistinct": false,
+          "columns": ["certificate_number"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "account_user_id_idx": {
+          "name": "account_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_account_on_account_id_provider_id": {
+          "name": "idx_account_on_account_id_provider_id",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "account_user_id_user_id_fk": {
+          "name": "account_user_id_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_key": {
+      "name": "api_key",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key_hash": {
+          "name": "key_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'personal'"
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "api_key_workspace_type_idx": {
+          "name": "api_key_workspace_type_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "api_key_user_type_idx": {
+          "name": "api_key_user_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "api_key_key_hash_idx": {
+          "name": "api_key_key_hash_idx",
+          "columns": [
+            {
+              "expression": "key_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "api_key_user_id_user_id_fk": {
+          "name": "api_key_user_id_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_workspace_id_workspace_id_fk": {
+          "name": "api_key_workspace_id_workspace_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_created_by_user_id_fk": {
+          "name": "api_key_created_by_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_key_key_unique": {
+          "name": "api_key_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {
+        "workspace_type_check": {
+          "name": "workspace_type_check",
+          "value": "(type = 'workspace' AND workspace_id IS NOT NULL) OR (type = 'personal' AND workspace_id IS NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.async_jobs": {
+      "name": "async_jobs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_at": {
+          "name": "run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 3
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "output": {
+          "name": "output",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "async_jobs_status_started_at_idx": {
+          "name": "async_jobs_status_started_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "async_jobs_status_completed_at_idx": {
+          "name": "async_jobs_status_completed_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.audit_log": {
+      "name": "audit_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_id": {
+          "name": "actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_type": {
+          "name": "resource_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_id": {
+          "name": "resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_name": {
+          "name": "actor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_email": {
+          "name": "actor_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resource_name": {
+          "name": "resource_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "audit_log_workspace_created_idx": {
+          "name": "audit_log_workspace_created_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_workspace_created_at_id_idx": {
+          "name": "audit_log_workspace_created_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"created_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_actor_created_idx": {
+          "name": "audit_log_actor_created_idx",
+          "columns": [
+            {
+              "expression": "actor_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_resource_idx": {
+          "name": "audit_log_resource_idx",
+          "columns": [
+            {
+              "expression": "resource_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_action_idx": {
+          "name": "audit_log_action_idx",
+          "columns": [
+            {
+              "expression": "action",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "audit_log_workspace_id_workspace_id_fk": {
+          "name": "audit_log_workspace_id_workspace_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "audit_log_actor_id_user_id_fk": {
+          "name": "audit_log_actor_id_user_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "user",
+          "columnsFrom": ["actor_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chat": {
+      "name": "chat",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "output_configs": {
+          "name": "output_configs",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "identifier_idx": {
+          "name": "identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"chat\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "chat_archived_at_partial_idx": {
+          "name": "chat_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"chat\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "chat_workflow_id_workflow_id_fk": {
+          "name": "chat_workflow_id_workflow_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "chat_user_id_user_id_fk": {
+          "name": "chat_user_id_user_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_async_tool_calls": {
+      "name": "copilot_async_tool_calls",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "checkpoint_id": {
+          "name": "checkpoint_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tool_call_id": {
+          "name": "tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "args": {
+          "name": "args",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_async_tool_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "result": {
+          "name": "result",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_async_tool_calls_run_id_idx": {
+          "name": "copilot_async_tool_calls_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_checkpoint_id_idx": {
+          "name": "copilot_async_tool_calls_checkpoint_id_idx",
+          "columns": [
+            {
+              "expression": "checkpoint_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_idx": {
+          "name": "copilot_async_tool_calls_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_status_idx": {
+          "name": "copilot_async_tool_calls_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_run_status_idx": {
+          "name": "copilot_async_tool_calls_run_status_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_unique": {
+          "name": "copilot_async_tool_calls_tool_call_id_unique",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_async_tool_calls_run_id_copilot_runs_id_fk": {
+          "name": "copilot_async_tool_calls_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk": {
+          "name": "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_run_checkpoints",
+          "columnsFrom": ["checkpoint_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_chats": {
+      "name": "copilot_chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "chat_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'copilot'"
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "messages": {
+          "name": "messages",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'claude-3-7-sonnet-latest'"
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "preview_yaml": {
+          "name": "preview_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan_artifact": {
+          "name": "plan_artifact",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resources": {
+          "name": "resources",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pinned": {
+          "name": "pinned",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_chats_user_id_idx": {
+          "name": "copilot_chats_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_workflow_id_idx": {
+          "name": "copilot_chats_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workflow_idx": {
+          "name": "copilot_chats_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workspace_idx": {
+          "name": "copilot_chats_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_created_at_idx": {
+          "name": "copilot_chats_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_updated_at_idx": {
+          "name": "copilot_chats_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_workspace_created_at_id_idx": {
+          "name": "copilot_chats_workspace_created_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"created_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_chats_user_id_user_id_fk": {
+          "name": "copilot_chats_user_id_user_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workflow_id_workflow_id_fk": {
+          "name": "copilot_chats_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workspace_id_workspace_id_fk": {
+          "name": "copilot_chats_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_feedback": {
+      "name": "copilot_feedback",
+      "schema": "",
+      "columns": {
+        "feedback_id": {
+          "name": "feedback_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_query": {
+          "name": "user_query",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent_response": {
+          "name": "agent_response",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_positive": {
+          "name": "is_positive",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "feedback": {
+          "name": "feedback",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_yaml": {
+          "name": "workflow_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_feedback_user_id_idx": {
+          "name": "copilot_feedback_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_chat_id_idx": {
+          "name": "copilot_feedback_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_user_chat_idx": {
+          "name": "copilot_feedback_user_chat_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_is_positive_idx": {
+          "name": "copilot_feedback_is_positive_idx",
+          "columns": [
+            {
+              "expression": "is_positive",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_created_at_idx": {
+          "name": "copilot_feedback_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_feedback_user_id_user_id_fk": {
+          "name": "copilot_feedback_user_id_user_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_feedback_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_feedback_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_run_checkpoints": {
+      "name": "copilot_run_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pending_tool_call_id": {
+          "name": "pending_tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "conversation_snapshot": {
+          "name": "conversation_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "agent_state": {
+          "name": "agent_state",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "provider_request": {
+          "name": "provider_request",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_run_checkpoints_run_id_idx": {
+          "name": "copilot_run_checkpoints_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_pending_tool_call_id_idx": {
+          "name": "copilot_run_checkpoints_pending_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_run_pending_tool_unique": {
+          "name": "copilot_run_checkpoints_run_pending_tool_unique",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_run_checkpoints_run_id_copilot_runs_id_fk": {
+          "name": "copilot_run_checkpoints_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_run_checkpoints",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_runs": {
+      "name": "copilot_runs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_run_id": {
+          "name": "parent_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stream_id": {
+          "name": "stream_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent": {
+          "name": "agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_run_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "request_context": {
+          "name": "request_context",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "copilot_runs_execution_id_idx": {
+          "name": "copilot_runs_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_parent_run_id_idx": {
+          "name": "copilot_runs_parent_run_id_idx",
+          "columns": [
+            {
+              "expression": "parent_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_id_idx": {
+          "name": "copilot_runs_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_user_id_idx": {
+          "name": "copilot_runs_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workflow_id_idx": {
+          "name": "copilot_runs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workspace_id_idx": {
+          "name": "copilot_runs_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_status_idx": {
+          "name": "copilot_runs_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_execution_idx": {
+          "name": "copilot_runs_chat_execution_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_execution_started_at_idx": {
+          "name": "copilot_runs_execution_started_at_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workspace_completed_at_id_idx": {
+          "name": "copilot_runs_workspace_completed_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"completed_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_stream_id_unique": {
+          "name": "copilot_runs_stream_id_unique",
+          "columns": [
+            {
+              "expression": "stream_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_runs_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_runs_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_user_id_user_id_fk": {
+          "name": "copilot_runs_user_id_user_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workflow_id_workflow_id_fk": {
+          "name": "copilot_runs_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workspace_id_workspace_id_fk": {
+          "name": "copilot_runs_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_workflow_read_hashes": {
+      "name": "copilot_workflow_read_hashes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_workflow_read_hashes_chat_id_idx": {
+          "name": "copilot_workflow_read_hashes_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_workflow_id_idx": {
+          "name": "copilot_workflow_read_hashes_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_chat_workflow_unique": {
+          "name": "copilot_workflow_read_hashes_chat_workflow_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_workflow_read_hashes_workflow_id_workflow_id_fk": {
+          "name": "copilot_workflow_read_hashes_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential": {
+      "name": "credential",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "credential_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_key": {
+          "name": "env_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_owner_user_id": {
+          "name": "env_owner_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_service_account_key": {
+          "name": "encrypted_service_account_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_workspace_id_idx": {
+          "name": "credential_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_type_idx": {
+          "name": "credential_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_provider_id_idx": {
+          "name": "credential_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_account_id_idx": {
+          "name": "credential_account_id_idx",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_env_owner_user_id_idx": {
+          "name": "credential_env_owner_user_id_idx",
+          "columns": [
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_account_unique": {
+          "name": "credential_workspace_account_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "account_id IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_env_unique": {
+          "name": "credential_workspace_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_workspace'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_personal_env_unique": {
+          "name": "credential_workspace_personal_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_personal'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_workspace_id_workspace_id_fk": {
+          "name": "credential_workspace_id_workspace_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_account_id_account_id_fk": {
+          "name": "credential_account_id_account_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "account",
+          "columnsFrom": ["account_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_env_owner_user_id_user_id_fk": {
+          "name": "credential_env_owner_user_id_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["env_owner_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_created_by_user_id_fk": {
+          "name": "credential_created_by_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "credential_oauth_source_check": {
+          "name": "credential_oauth_source_check",
+          "value": "(type <> 'oauth') OR (account_id IS NOT NULL AND provider_id IS NOT NULL)"
+        },
+        "credential_workspace_env_source_check": {
+          "name": "credential_workspace_env_source_check",
+          "value": "(type <> 'env_workspace') OR (env_key IS NOT NULL AND env_owner_user_id IS NULL)"
+        },
+        "credential_personal_env_source_check": {
+          "name": "credential_personal_env_source_check",
+          "value": "(type <> 'env_personal') OR (env_key IS NOT NULL AND env_owner_user_id IS NOT NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.credential_member": {
+      "name": "credential_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "credential_member_role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_member_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_member_user_id_idx": {
+          "name": "credential_member_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_role_idx": {
+          "name": "credential_member_role_idx",
+          "columns": [
+            {
+              "expression": "role",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_status_idx": {
+          "name": "credential_member_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_unique": {
+          "name": "credential_member_unique",
+          "columns": [
+            {
+              "expression": "credential_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_member_credential_id_credential_id_fk": {
+          "name": "credential_member_credential_id_credential_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_user_id_user_id_fk": {
+          "name": "credential_member_user_id_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_invited_by_user_id_fk": {
+          "name": "credential_member_invited_by_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set": {
+      "name": "credential_set",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_created_by_idx": {
+          "name": "credential_set_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_org_name_unique": {
+          "name": "credential_set_org_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_provider_id_idx": {
+          "name": "credential_set_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_organization_id_organization_id_fk": {
+          "name": "credential_set_organization_id_organization_id_fk",
+          "tableFrom": "credential_set",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_created_by_user_id_fk": {
+          "name": "credential_set_created_by_user_id_fk",
+          "tableFrom": "credential_set",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set_invitation": {
+      "name": "credential_set_invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_set_invitation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "accepted_at": {
+          "name": "accepted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "accepted_by_user_id": {
+          "name": "accepted_by_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_invitation_set_id_idx": {
+          "name": "credential_set_invitation_set_id_idx",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_token_idx": {
+          "name": "credential_set_invitation_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_status_idx": {
+          "name": "credential_set_invitation_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_expires_at_idx": {
+          "name": "credential_set_invitation_expires_at_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_invitation_credential_set_id_credential_set_id_fk": {
+          "name": "credential_set_invitation_credential_set_id_credential_set_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_invitation_invited_by_user_id_fk": {
+          "name": "credential_set_invitation_invited_by_user_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_invitation_accepted_by_user_id_user_id_fk": {
+          "name": "credential_set_invitation_accepted_by_user_id_user_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["accepted_by_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "credential_set_invitation_token_unique": {
+          "name": "credential_set_invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set_member": {
+      "name": "credential_set_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_set_member_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_member_user_id_idx": {
+          "name": "credential_set_member_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_member_unique": {
+          "name": "credential_set_member_unique",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_member_status_idx": {
+          "name": "credential_set_member_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_member_credential_set_id_credential_set_id_fk": {
+          "name": "credential_set_member_credential_set_id_credential_set_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_member_user_id_user_id_fk": {
+          "name": "credential_set_member_user_id_user_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_member_invited_by_user_id_fk": {
+          "name": "credential_set_member_invited_by_user_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.custom_tools": {
+      "name": "custom_tools",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schema": {
+          "name": "schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "custom_tools_workspace_id_idx": {
+          "name": "custom_tools_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "custom_tools_workspace_title_unique": {
+          "name": "custom_tools_workspace_title_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "title",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "custom_tools_workspace_id_workspace_id_fk": {
+          "name": "custom_tools_workspace_id_workspace_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "custom_tools_user_id_user_id_fk": {
+          "name": "custom_tools_user_id_user_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.data_drain_runs": {
+      "name": "data_drain_runs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "drain_id": {
+          "name": "drain_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "data_drain_run_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "data_drain_run_trigger",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "finished_at": {
+          "name": "finished_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rows_exported": {
+          "name": "rows_exported",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "bytes_written": {
+          "name": "bytes_written",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "cursor_before": {
+          "name": "cursor_before",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cursor_after": {
+          "name": "cursor_after",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "locators": {
+          "name": "locators",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        }
+      },
+      "indexes": {
+        "data_drain_runs_drain_started_idx": {
+          "name": "data_drain_runs_drain_started_idx",
+          "columns": [
+            {
+              "expression": "drain_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "data_drain_runs_drain_id_data_drains_id_fk": {
+          "name": "data_drain_runs_drain_id_data_drains_id_fk",
+          "tableFrom": "data_drain_runs",
+          "tableTo": "data_drains",
+          "columnsFrom": ["drain_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.data_drains": {
+      "name": "data_drains",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "data_drain_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_type": {
+          "name": "destination_type",
+          "type": "data_drain_destination",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_config": {
+          "name": "destination_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_credentials": {
+          "name": "destination_credentials",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schedule_cadence": {
+          "name": "schedule_cadence",
+          "type": "data_drain_cadence",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "cursor": {
+          "name": "cursor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_success_at": {
+          "name": "last_success_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "data_drains_org_idx": {
+          "name": "data_drains_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "data_drains_due_idx": {
+          "name": "data_drains_due_idx",
+          "columns": [
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "last_run_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "data_drains_org_name_unique": {
+          "name": "data_drains_org_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "data_drains_organization_id_organization_id_fk": {
+          "name": "data_drains_organization_id_organization_id_fk",
+          "tableFrom": "data_drains",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "data_drains_created_by_user_id_fk": {
+          "name": "data_drains_created_by_user_id_fk",
+          "tableFrom": "data_drains",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.docs_embeddings": {
+      "name": "docs_embeddings",
+      "schema": "",
+      "columns": {
+        "chunk_id": {
+          "name": "chunk_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chunk_text": {
+          "name": "chunk_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_document": {
+          "name": "source_document",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_link": {
+          "name": "source_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_text": {
+          "name": "header_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_level": {
+          "name": "header_level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "chunk_text_tsv": {
+          "name": "chunk_text_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"docs_embeddings\".\"chunk_text\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "docs_emb_source_document_idx": {
+          "name": "docs_emb_source_document_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_header_level_idx": {
+          "name": "docs_emb_header_level_idx",
+          "columns": [
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_source_header_idx": {
+          "name": "docs_emb_source_header_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_model_idx": {
+          "name": "docs_emb_model_idx",
+          "columns": [
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_created_at_idx": {
+          "name": "docs_emb_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_embedding_vector_hnsw_idx": {
+          "name": "docs_embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "docs_emb_metadata_gin_idx": {
+          "name": "docs_emb_metadata_gin_idx",
+          "columns": [
+            {
+              "expression": "metadata",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "docs_emb_chunk_text_fts_idx": {
+          "name": "docs_emb_chunk_text_fts_idx",
+          "columns": [
+            {
+              "expression": "chunk_text_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "docs_embedding_not_null_check": {
+          "name": "docs_embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        },
+        "docs_header_level_check": {
+          "name": "docs_header_level_check",
+          "value": "\"header_level\" >= 1 AND \"header_level\" <= 6"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.document": {
+      "name": "document",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_url": {
+          "name": "file_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_size": {
+          "name": "file_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mime_type": {
+          "name": "mime_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_count": {
+          "name": "chunk_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "character_count": {
+          "name": "character_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "processing_status": {
+          "name": "processing_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_completed_at": {
+          "name": "processing_completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_error": {
+          "name": "processing_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_excluded": {
+          "name": "user_excluded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_url": {
+          "name": "source_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "doc_kb_id_idx": {
+          "name": "doc_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_filename_idx": {
+          "name": "doc_filename_idx",
+          "columns": [
+            {
+              "expression": "filename",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_processing_status_idx": {
+          "name": "doc_processing_status_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "processing_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_external_id_idx": {
+          "name": "doc_connector_external_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "external_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"document\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_id_idx": {
+          "name": "doc_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_archived_at_partial_idx": {
+          "name": "doc_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"document\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_deleted_at_partial_idx": {
+          "name": "doc_deleted_at_partial_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"document\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag1_idx": {
+          "name": "doc_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag2_idx": {
+          "name": "doc_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag3_idx": {
+          "name": "doc_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag4_idx": {
+          "name": "doc_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag5_idx": {
+          "name": "doc_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag6_idx": {
+          "name": "doc_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag7_idx": {
+          "name": "doc_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number1_idx": {
+          "name": "doc_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number2_idx": {
+          "name": "doc_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number3_idx": {
+          "name": "doc_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number4_idx": {
+          "name": "doc_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number5_idx": {
+          "name": "doc_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date1_idx": {
+          "name": "doc_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date2_idx": {
+          "name": "doc_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean1_idx": {
+          "name": "doc_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean2_idx": {
+          "name": "doc_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean3_idx": {
+          "name": "doc_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "document_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "document_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "document_connector_id_knowledge_connector_id_fk": {
+          "name": "document_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.embedding": {
+      "name": "embedding",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_id": {
+          "name": "document_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_index": {
+          "name": "chunk_index",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_hash": {
+          "name": "chunk_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content_length": {
+          "name": "content_length",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "start_offset": {
+          "name": "start_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "end_offset": {
+          "name": "end_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "content_tsv": {
+          "name": "content_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"embedding\".\"content\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "emb_kb_id_idx": {
+          "name": "emb_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_id_idx": {
+          "name": "emb_doc_id_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_chunk_idx": {
+          "name": "emb_doc_chunk_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chunk_index",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_model_idx": {
+          "name": "emb_kb_model_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_enabled_idx": {
+          "name": "emb_kb_enabled_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_enabled_idx": {
+          "name": "emb_doc_enabled_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "embedding_vector_hnsw_idx": {
+          "name": "embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "emb_tag1_idx": {
+          "name": "emb_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag2_idx": {
+          "name": "emb_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag3_idx": {
+          "name": "emb_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag4_idx": {
+          "name": "emb_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag5_idx": {
+          "name": "emb_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag6_idx": {
+          "name": "emb_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag7_idx": {
+          "name": "emb_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number1_idx": {
+          "name": "emb_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number2_idx": {
+          "name": "emb_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number3_idx": {
+          "name": "emb_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number4_idx": {
+          "name": "emb_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number5_idx": {
+          "name": "emb_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date1_idx": {
+          "name": "emb_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date2_idx": {
+          "name": "emb_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean1_idx": {
+          "name": "emb_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean2_idx": {
+          "name": "emb_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean3_idx": {
+          "name": "emb_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_content_fts_idx": {
+          "name": "emb_content_fts_idx",
+          "columns": [
+            {
+              "expression": "content_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "embedding_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "embedding_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "embedding_document_id_document_id_fk": {
+          "name": "embedding_document_id_document_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "document",
+          "columnsFrom": ["document_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "embedding_not_null_check": {
+          "name": "embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.environment": {
+      "name": "environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_user_id_user_id_fk": {
+          "name": "environment_user_id_user_id_fk",
+          "tableFrom": "environment",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "environment_user_id_unique": {
+          "name": "environment_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.form": {
+      "name": "form",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "show_branding": {
+          "name": "show_branding",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "form_identifier_idx": {
+          "name": "form_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"form\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_workflow_id_idx": {
+          "name": "form_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_user_id_idx": {
+          "name": "form_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_archived_at_partial_idx": {
+          "name": "form_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"form\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "form_workflow_id_workflow_id_fk": {
+          "name": "form_workflow_id_workflow_id_fk",
+          "tableFrom": "form",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "form_user_id_user_id_fk": {
+          "name": "form_user_id_user_id_fk",
+          "tableFrom": "form",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.idempotency_key": {
+      "name": "idempotency_key",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "result": {
+          "name": "result",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idempotency_key_created_at_idx": {
+          "name": "idempotency_key_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation": {
+      "name": "invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "kind": {
+          "name": "kind",
+          "type": "invitation_kind",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'organization'"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "membership_intent": {
+          "name": "membership_intent",
+          "type": "invitation_membership_intent",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'internal'"
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "invitation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "invitation_email_idx": {
+          "name": "invitation_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_organization_id_idx": {
+          "name": "invitation_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_status_idx": {
+          "name": "invitation_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_pending_email_org_unique": {
+          "name": "invitation_pending_email_org_unique",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"invitation\".\"status\" = 'pending' AND \"invitation\".\"organization_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_inviter_id_user_id_fk": {
+          "name": "invitation_inviter_id_user_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "user",
+          "columnsFrom": ["inviter_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_organization_id_organization_id_fk": {
+          "name": "invitation_organization_id_organization_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "invitation_token_unique": {
+          "name": "invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation_workspace_grant": {
+      "name": "invitation_workspace_grant",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "invitation_id": {
+          "name": "invitation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission": {
+          "name": "permission",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "invitation_workspace_grant_unique": {
+          "name": "invitation_workspace_grant_unique",
+          "columns": [
+            {
+              "expression": "invitation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_workspace_grant_workspace_id_idx": {
+          "name": "invitation_workspace_grant_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_workspace_grant_invitation_id_invitation_id_fk": {
+          "name": "invitation_workspace_grant_invitation_id_invitation_id_fk",
+          "tableFrom": "invitation_workspace_grant",
+          "tableTo": "invitation",
+          "columnsFrom": ["invitation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_workspace_grant_workspace_id_workspace_id_fk": {
+          "name": "invitation_workspace_grant_workspace_id_workspace_id_fk",
+          "tableFrom": "invitation_workspace_grant",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.job_execution_logs": {
+      "name": "job_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "schedule_id": {
+          "name": "schedule_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "job_execution_logs_schedule_id_idx": {
+          "name": "job_execution_logs_schedule_id_idx",
+          "columns": [
+            {
+              "expression": "schedule_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_workspace_started_at_idx": {
+          "name": "job_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_workspace_ended_at_id_idx": {
+          "name": "job_execution_logs_workspace_ended_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"ended_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_execution_id_unique": {
+          "name": "job_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_trigger_idx": {
+          "name": "job_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "job_execution_logs_schedule_id_workflow_schedule_id_fk": {
+          "name": "job_execution_logs_schedule_id_workflow_schedule_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workflow_schedule",
+          "columnsFrom": ["schedule_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "job_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "job_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.jwks": {
+      "name": "jwks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "public_key": {
+          "name": "public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "private_key": {
+          "name": "private_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base": {
+      "name": "knowledge_base",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "embedding_dimension": {
+          "name": "embedding_dimension",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1536
+        },
+        "chunking_config": {
+          "name": "chunking_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{\"maxSize\": 1024, \"minSize\": 1, \"overlap\": 200}'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_user_id_idx": {
+          "name": "kb_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_id_idx": {
+          "name": "kb_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_user_workspace_idx": {
+          "name": "kb_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_deleted_at_idx": {
+          "name": "kb_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_deleted_partial_idx": {
+          "name": "kb_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_base\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_name_active_unique": {
+          "name": "kb_workspace_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"knowledge_base\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_user_id_user_id_fk": {
+          "name": "knowledge_base_user_id_user_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "knowledge_base_workspace_id_workspace_id_fk": {
+          "name": "knowledge_base_workspace_id_workspace_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base_tag_definitions": {
+      "name": "knowledge_base_tag_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag_slot": {
+          "name": "tag_slot",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "field_type": {
+          "name": "field_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_tag_definitions_kb_slot_idx": {
+          "name": "kb_tag_definitions_kb_slot_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "tag_slot",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_display_name_idx": {
+          "name": "kb_tag_definitions_kb_display_name_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_id_idx": {
+          "name": "kb_tag_definitions_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_base_tag_definitions",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector": {
+      "name": "knowledge_connector",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connector_type": {
+          "name": "connector_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_config": {
+          "name": "source_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sync_mode": {
+          "name": "sync_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'full'"
+        },
+        "sync_interval_minutes": {
+          "name": "sync_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1440
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_sync_at": {
+          "name": "last_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_error": {
+          "name": "last_sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_doc_count": {
+          "name": "last_sync_doc_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_sync_at": {
+          "name": "next_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "consecutive_failures": {
+          "name": "consecutive_failures",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kc_knowledge_base_id_idx": {
+          "name": "kc_knowledge_base_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_status_next_sync_idx": {
+          "name": "kc_status_next_sync_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_sync_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_archived_at_partial_idx": {
+          "name": "kc_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_connector\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_deleted_at_partial_idx": {
+          "name": "kc_deleted_at_partial_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_connector\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_connector_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_connector",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector_sync_log": {
+      "name": "knowledge_connector_sync_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "docs_added": {
+          "name": "docs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_updated": {
+          "name": "docs_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_deleted": {
+          "name": "docs_deleted",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_unchanged": {
+          "name": "docs_unchanged",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_failed": {
+          "name": "docs_failed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kcsl_connector_id_idx": {
+          "name": "kcsl_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk": {
+          "name": "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "knowledge_connector_sync_log",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mcp_server_oauth": {
+      "name": "mcp_server_oauth",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "mcp_server_id": {
+          "name": "mcp_server_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_information": {
+          "name": "client_information",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tokens": {
+          "name": "tokens",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "code_verifier": {
+          "name": "code_verifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state_created_at": {
+          "name": "state_created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_refreshed_at": {
+          "name": "last_refreshed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mcp_server_oauth_server_unique": {
+          "name": "mcp_server_oauth_server_unique",
+          "columns": [
+            {
+              "expression": "mcp_server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "mcp_server_oauth_state_idx": {
+          "name": "mcp_server_oauth_state_idx",
+          "columns": [
+            {
+              "expression": "state",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mcp_server_oauth_mcp_server_id_mcp_servers_id_fk": {
+          "name": "mcp_server_oauth_mcp_server_id_mcp_servers_id_fk",
+          "tableFrom": "mcp_server_oauth",
+          "tableTo": "mcp_servers",
+          "columnsFrom": ["mcp_server_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mcp_server_oauth_user_id_user_id_fk": {
+          "name": "mcp_server_oauth_user_id_user_id_fk",
+          "tableFrom": "mcp_server_oauth",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "mcp_server_oauth_workspace_id_workspace_id_fk": {
+          "name": "mcp_server_oauth_workspace_id_workspace_id_fk",
+          "tableFrom": "mcp_server_oauth",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mcp_servers": {
+      "name": "mcp_servers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "transport": {
+          "name": "transport",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'headers'"
+        },
+        "oauth_client_id": {
+          "name": "oauth_client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "oauth_client_secret": {
+          "name": "oauth_client_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "headers": {
+          "name": "headers",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "timeout": {
+          "name": "timeout",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 30000
+        },
+        "retries": {
+          "name": "retries",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 3
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_connected": {
+          "name": "last_connected",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connection_status": {
+          "name": "connection_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'disconnected'"
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_config": {
+          "name": "status_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "tool_count": {
+          "name": "tool_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_tools_refresh": {
+          "name": "last_tools_refresh",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_requests": {
+          "name": "total_requests",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mcp_servers_workspace_enabled_idx": {
+          "name": "mcp_servers_workspace_enabled_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "mcp_servers_workspace_deleted_partial_idx": {
+          "name": "mcp_servers_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"mcp_servers\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mcp_servers_workspace_id_workspace_id_fk": {
+          "name": "mcp_servers_workspace_id_workspace_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mcp_servers_created_by_user_id_fk": {
+          "name": "mcp_servers_created_by_user_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.member": {
+      "name": "member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "member_user_id_unique": {
+          "name": "member_user_id_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "member_organization_id_idx": {
+          "name": "member_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "member_user_id_user_id_fk": {
+          "name": "member_user_id_user_id_fk",
+          "tableFrom": "member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "member_organization_id_organization_id_fk": {
+          "name": "member_organization_id_organization_id_fk",
+          "tableFrom": "member",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.memory": {
+      "name": "memory",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "memory_key_idx": {
+          "name": "memory_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_idx": {
+          "name": "memory_workspace_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_key_idx": {
+          "name": "memory_workspace_key_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_deleted_partial_idx": {
+          "name": "memory_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"memory\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "memory_workspace_id_workspace_id_fk": {
+          "name": "memory_workspace_id_workspace_id_fk",
+          "tableFrom": "memory",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_allowed_sender": {
+      "name": "mothership_inbox_allowed_sender",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "label": {
+          "name": "label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "added_by": {
+          "name": "added_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "inbox_sender_ws_email_idx": {
+          "name": "inbox_sender_ws_email_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_allowed_sender_added_by_user_id_fk": {
+          "name": "mothership_inbox_allowed_sender_added_by_user_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "user",
+          "columnsFrom": ["added_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_task": {
+      "name": "mothership_inbox_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_email": {
+          "name": "from_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_name": {
+          "name": "from_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subject": {
+          "name": "subject",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body_preview": {
+          "name": "body_preview",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_text": {
+          "name": "body_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_html": {
+          "name": "body_html",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_message_id": {
+          "name": "email_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "in_reply_to": {
+          "name": "in_reply_to",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_message_id": {
+          "name": "response_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "agentmail_message_id": {
+          "name": "agentmail_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'received'"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_job_id": {
+          "name": "trigger_job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "result_summary": {
+          "name": "result_summary",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejection_reason": {
+          "name": "rejection_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_attachments": {
+          "name": "has_attachments",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "cc_recipients": {
+          "name": "cc_recipients",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "inbox_task_ws_created_at_idx": {
+          "name": "inbox_task_ws_created_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_ws_status_idx": {
+          "name": "inbox_task_ws_status_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_response_msg_id_idx": {
+          "name": "inbox_task_response_msg_id_idx",
+          "columns": [
+            {
+              "expression": "response_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_email_msg_id_idx": {
+          "name": "inbox_task_email_msg_id_idx",
+          "columns": [
+            {
+              "expression": "email_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_task_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_task_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_task_chat_id_copilot_chats_id_fk": {
+          "name": "mothership_inbox_task_chat_id_copilot_chats_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_webhook": {
+      "name": "mothership_inbox_webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "webhook_id": {
+          "name": "webhook_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "mothership_inbox_webhook_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_webhook_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_webhook",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "mothership_inbox_webhook_workspace_id_unique": {
+          "name": "mothership_inbox_webhook_workspace_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["workspace_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_settings": {
+      "name": "mothership_settings",
+      "schema": "",
+      "columns": {
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "mcp_tool_refs": {
+          "name": "mcp_tool_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "custom_tool_refs": {
+          "name": "custom_tool_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "skill_refs": {
+          "name": "skill_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mothership_settings_workspace_id_idx": {
+          "name": "mothership_settings_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_settings_workspace_id_workspace_id_fk": {
+          "name": "mothership_settings_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_settings",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_access_token": {
+      "name": "oauth_access_token",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_access_token_access_token_idx": {
+          "name": "oauth_access_token_access_token_idx",
+          "columns": [
+            {
+              "expression": "access_token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "oauth_access_token_refresh_token_idx": {
+          "name": "oauth_access_token_refresh_token_idx",
+          "columns": [
+            {
+              "expression": "refresh_token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_access_token_client_id_oauth_application_client_id_fk": {
+          "name": "oauth_access_token_client_id_oauth_application_client_id_fk",
+          "tableFrom": "oauth_access_token",
+          "tableTo": "oauth_application",
+          "columnsFrom": ["client_id"],
+          "columnsTo": ["client_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_access_token_user_id_user_id_fk": {
+          "name": "oauth_access_token_user_id_user_id_fk",
+          "tableFrom": "oauth_access_token",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_access_token_access_token_unique": {
+          "name": "oauth_access_token_access_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["access_token"]
+        },
+        "oauth_access_token_refresh_token_unique": {
+          "name": "oauth_access_token_refresh_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["refresh_token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_application": {
+      "name": "oauth_application",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_secret": {
+          "name": "client_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "redirect_urls": {
+          "name": "redirect_urls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_application_client_id_idx": {
+          "name": "oauth_application_client_id_idx",
+          "columns": [
+            {
+              "expression": "client_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_application_user_id_user_id_fk": {
+          "name": "oauth_application_user_id_user_id_fk",
+          "tableFrom": "oauth_application",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_application_client_id_unique": {
+          "name": "oauth_application_client_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["client_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_consent": {
+      "name": "oauth_consent",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "consent_given": {
+          "name": "consent_given",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_consent_user_client_idx": {
+          "name": "oauth_consent_user_client_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "client_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_consent_client_id_oauth_application_client_id_fk": {
+          "name": "oauth_consent_client_id_oauth_application_client_id_fk",
+          "tableFrom": "oauth_consent",
+          "tableTo": "oauth_application",
+          "columnsFrom": ["client_id"],
+          "columnsTo": ["client_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_consent_user_id_user_id_fk": {
+          "name": "oauth_consent_user_id_user_id_fk",
+          "tableFrom": "oauth_consent",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organization": {
+      "name": "organization",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "whitelabel_settings": {
+          "name": "whitelabel_settings",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "data_retention_settings": {
+          "name": "data_retention_settings",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_usage_limit": {
+          "name": "org_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "departed_member_usage": {
+          "name": "departed_member_usage",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.outbox_event": {
+      "name": "outbox_event",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10
+        },
+        "available_at": {
+          "name": "available_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "locked_at": {
+          "name": "locked_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "outbox_event_status_available_idx": {
+          "name": "outbox_event_status_available_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "available_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "outbox_event_locked_at_idx": {
+          "name": "outbox_event_locked_at_idx",
+          "columns": [
+            {
+              "expression": "locked_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.paused_executions": {
+      "name": "paused_executions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_snapshot": {
+          "name": "execution_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pause_points": {
+          "name": "pause_points",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_pause_count": {
+          "name": "total_pause_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resumed_count": {
+          "name": "resumed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'paused'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "paused_at": {
+          "name": "paused_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_resume_at": {
+          "name": "next_resume_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "paused_executions_workflow_id_idx": {
+          "name": "paused_executions_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_status_idx": {
+          "name": "paused_executions_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_execution_id_unique": {
+          "name": "paused_executions_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_next_resume_at_idx": {
+          "name": "paused_executions_next_resume_at_idx",
+          "columns": [
+            {
+              "expression": "next_resume_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "status = 'paused' AND next_resume_at IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "paused_executions_workflow_id_workflow_id_fk": {
+          "name": "paused_executions_workflow_id_workflow_id_fk",
+          "tableFrom": "paused_executions",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.pending_credential_draft": {
+      "name": "pending_credential_draft",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "pending_draft_user_provider_ws": {
+          "name": "pending_draft_user_provider_ws",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "pending_credential_draft_user_id_user_id_fk": {
+          "name": "pending_credential_draft_user_id_user_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_workspace_id_workspace_id_fk": {
+          "name": "pending_credential_draft_workspace_id_workspace_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_credential_id_credential_id_fk": {
+          "name": "pending_credential_draft_credential_id_credential_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group": {
+      "name": "permission_group",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "auto_add_new_members": {
+          "name": "auto_add_new_members",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "permission_group_created_by_idx": {
+          "name": "permission_group_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_workspace_name_unique": {
+          "name": "permission_group_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_workspace_auto_add_unique": {
+          "name": "permission_group_workspace_auto_add_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "auto_add_new_members = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_workspace_id_workspace_id_fk": {
+          "name": "permission_group_workspace_id_workspace_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_created_by_user_id_fk": {
+          "name": "permission_group_created_by_user_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group_member": {
+      "name": "permission_group_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "permission_group_id": {
+          "name": "permission_group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "assigned_by": {
+          "name": "assigned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "assigned_at": {
+          "name": "assigned_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permission_group_member_group_id_idx": {
+          "name": "permission_group_member_group_id_idx",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_member_group_user_unique": {
+          "name": "permission_group_member_group_user_unique",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_member_workspace_user_unique": {
+          "name": "permission_group_member_workspace_user_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_member_permission_group_id_permission_group_id_fk": {
+          "name": "permission_group_member_permission_group_id_permission_group_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "permission_group",
+          "columnsFrom": ["permission_group_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_workspace_id_workspace_id_fk": {
+          "name": "permission_group_member_workspace_id_workspace_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_user_id_user_id_fk": {
+          "name": "permission_group_member_user_id_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_assigned_by_user_id_fk": {
+          "name": "permission_group_member_assigned_by_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["assigned_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permissions": {
+      "name": "permissions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_type": {
+          "name": "entity_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_id": {
+          "name": "entity_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission_type": {
+          "name": "permission_type",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permissions_user_id_idx": {
+          "name": "permissions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_entity_idx": {
+          "name": "permissions_entity_idx",
+          "columns": [
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_type_idx": {
+          "name": "permissions_user_entity_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_permission_idx": {
+          "name": "permissions_user_entity_permission_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "permission_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_idx": {
+          "name": "permissions_user_entity_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_unique_constraint": {
+          "name": "permissions_unique_constraint",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permissions_user_id_user_id_fk": {
+          "name": "permissions_user_id_user_id_fk",
+          "tableFrom": "permissions",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.rate_limit_bucket": {
+      "name": "rate_limit_bucket",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "tokens": {
+          "name": "tokens",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_refill_at": {
+          "name": "last_refill_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.resume_queue": {
+      "name": "resume_queue",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "paused_execution_id": {
+          "name": "paused_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_execution_id": {
+          "name": "parent_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "new_execution_id": {
+          "name": "new_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "context_id": {
+          "name": "context_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resume_input": {
+          "name": "resume_input",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "queued_at": {
+          "name": "queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "failure_reason": {
+          "name": "failure_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "resume_queue_parent_status_idx": {
+          "name": "resume_queue_parent_status_idx",
+          "columns": [
+            {
+              "expression": "parent_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "queued_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "resume_queue_new_execution_idx": {
+          "name": "resume_queue_new_execution_idx",
+          "columns": [
+            {
+              "expression": "new_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "resume_queue_paused_execution_id_paused_executions_id_fk": {
+          "name": "resume_queue_paused_execution_id_paused_executions_id_fk",
+          "tableFrom": "resume_queue",
+          "tableTo": "paused_executions",
+          "columnsFrom": ["paused_execution_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "impersonated_by": {
+          "name": "impersonated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "session_user_id_idx": {
+          "name": "session_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "session_token_idx": {
+          "name": "session_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "session_active_organization_id_organization_id_fk": {
+          "name": "session_active_organization_id_organization_id_fk",
+          "tableFrom": "session",
+          "tableTo": "organization",
+          "columnsFrom": ["active_organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "session_token_unique": {
+          "name": "session_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.settings": {
+      "name": "settings",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "theme": {
+          "name": "theme",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'system'"
+        },
+        "auto_connect": {
+          "name": "auto_connect",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "telemetry_enabled": {
+          "name": "telemetry_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "email_preferences": {
+          "name": "email_preferences",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "billing_usage_notifications_enabled": {
+          "name": "billing_usage_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "show_training_controls": {
+          "name": "show_training_controls",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "super_user_mode_enabled": {
+          "name": "super_user_mode_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "mothership_environment": {
+          "name": "mothership_environment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'default'"
+        },
+        "error_notifications_enabled": {
+          "name": "error_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "snap_to_grid_size": {
+          "name": "snap_to_grid_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "show_action_bar": {
+          "name": "show_action_bar",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "copilot_enabled_models": {
+          "name": "copilot_enabled_models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "copilot_auto_allowed_tools": {
+          "name": "copilot_auto_allowed_tools",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "last_active_workspace_id": {
+          "name": "last_active_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "settings_user_id_user_id_fk": {
+          "name": "settings_user_id_user_id_fk",
+          "tableFrom": "settings",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "settings_user_id_unique": {
+          "name": "settings_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.skill": {
+      "name": "skill",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "skill_workspace_name_unique": {
+          "name": "skill_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "skill_workspace_id_workspace_id_fk": {
+          "name": "skill_workspace_id_workspace_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "skill_user_id_user_id_fk": {
+          "name": "skill_user_id_user_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sso_provider": {
+      "name": "sso_provider",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "domain": {
+          "name": "domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "oidc_config": {
+          "name": "oidc_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "saml_config": {
+          "name": "saml_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "sso_provider_provider_id_idx": {
+          "name": "sso_provider_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_domain_idx": {
+          "name": "sso_provider_domain_idx",
+          "columns": [
+            {
+              "expression": "domain",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_user_id_idx": {
+          "name": "sso_provider_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_organization_id_idx": {
+          "name": "sso_provider_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sso_provider_user_id_user_id_fk": {
+          "name": "sso_provider_user_id_user_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "sso_provider_organization_id_organization_id_fk": {
+          "name": "sso_provider_organization_id_organization_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.subscription": {
+      "name": "subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan": {
+          "name": "plan",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_subscription_id": {
+          "name": "stripe_subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_start": {
+          "name": "period_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_end": {
+          "name": "period_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at_period_end": {
+          "name": "cancel_at_period_end",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "seats": {
+          "name": "seats",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_start": {
+          "name": "trial_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_end": {
+          "name": "trial_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "subscription_reference_status_idx": {
+          "name": "subscription_reference_status_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "check_enterprise_metadata": {
+          "name": "check_enterprise_metadata",
+          "value": "plan != 'enterprise' OR metadata IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.table_row_executions": {
+      "name": "table_row_executions",
+      "schema": "",
+      "columns": {
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "row_id": {
+          "name": "row_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_id": {
+          "name": "job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "running_block_ids": {
+          "name": "running_block_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "block_errors": {
+          "name": "block_errors",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "cancelled_at": {
+          "name": "cancelled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "table_row_executions_table_status_idx": {
+          "name": "table_row_executions_table_status_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"table_row_executions\".\"status\" IN ('queued', 'running', 'pending')",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_row_executions_execution_id_idx": {
+          "name": "table_row_executions_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"table_row_executions\".\"execution_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_row_executions_table_group_idx": {
+          "name": "table_row_executions_table_group_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "table_row_executions_table_id_user_table_definitions_id_fk": {
+          "name": "table_row_executions_table_id_user_table_definitions_id_fk",
+          "tableFrom": "table_row_executions",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_row_executions_row_id_user_table_rows_id_fk": {
+          "name": "table_row_executions_row_id_user_table_rows_id_fk",
+          "tableFrom": "table_row_executions",
+          "tableTo": "user_table_rows",
+          "columnsFrom": ["row_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "table_row_executions_row_id_group_id_pk": {
+          "name": "table_row_executions_row_id_group_id_pk",
+          "columns": ["row_id", "group_id"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.table_run_dispatches": {
+      "name": "table_run_dispatches",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mode": {
+          "name": "mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scope": {
+          "name": "scope",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "cursor": {
+          "name": "cursor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "is_manual_run": {
+          "name": "is_manual_run",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "requested_at": {
+          "name": "requested_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancelled_at": {
+          "name": "cancelled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "table_run_dispatches_active_idx": {
+          "name": "table_run_dispatches_active_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_run_dispatches_watchdog_idx": {
+          "name": "table_run_dispatches_watchdog_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "requested_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "table_run_dispatches_table_id_user_table_definitions_id_fk": {
+          "name": "table_run_dispatches_table_id_user_table_definitions_id_fk",
+          "tableFrom": "table_run_dispatches",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_run_dispatches_workspace_id_workspace_id_fk": {
+          "name": "table_run_dispatches_workspace_id_workspace_id_fk",
+          "tableFrom": "table_run_dispatches",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.template_creators": {
+      "name": "template_creators",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "reference_type": {
+          "name": "reference_type",
+          "type": "template_creator_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "profile_image_url": {
+          "name": "profile_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "details": {
+          "name": "details",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "verified": {
+          "name": "verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "template_creators_reference_idx": {
+          "name": "template_creators_reference_idx",
+          "columns": [
+            {
+              "expression": "reference_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_creators_reference_id_idx": {
+          "name": "template_creators_reference_id_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_creators_created_by_idx": {
+          "name": "template_creators_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "template_creators_created_by_user_id_fk": {
+          "name": "template_creators_created_by_user_id_fk",
+          "tableFrom": "template_creators",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.template_stars": {
+      "name": "template_stars",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "template_id": {
+          "name": "template_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "starred_at": {
+          "name": "starred_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "template_stars_user_id_idx": {
+          "name": "template_stars_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_id_idx": {
+          "name": "template_stars_template_id_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_user_template_idx": {
+          "name": "template_stars_user_template_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_user_idx": {
+          "name": "template_stars_template_user_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_starred_at_idx": {
+          "name": "template_stars_starred_at_idx",
+          "columns": [
+            {
+              "expression": "starred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_starred_at_idx": {
+          "name": "template_stars_template_starred_at_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "starred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_user_template_unique": {
+          "name": "template_stars_user_template_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "template_stars_user_id_user_id_fk": {
+          "name": "template_stars_user_id_user_id_fk",
+          "tableFrom": "template_stars",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "template_stars_template_id_templates_id_fk": {
+          "name": "template_stars_template_id_templates_id_fk",
+          "tableFrom": "template_stars",
+          "tableTo": "templates",
+          "columnsFrom": ["template_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.templates": {
+      "name": "templates",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "details": {
+          "name": "details",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "views": {
+          "name": "views",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "stars": {
+          "name": "stars",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "template_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "tags": {
+          "name": "tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "required_credentials": {
+          "name": "required_credentials",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "state": {
+          "name": "state",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "og_image_url": {
+          "name": "og_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "templates_status_idx": {
+          "name": "templates_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_creator_id_idx": {
+          "name": "templates_creator_id_idx",
+          "columns": [
+            {
+              "expression": "creator_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_views_idx": {
+          "name": "templates_views_idx",
+          "columns": [
+            {
+              "expression": "views",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_stars_idx": {
+          "name": "templates_stars_idx",
+          "columns": [
+            {
+              "expression": "stars",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_status_views_idx": {
+          "name": "templates_status_views_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "views",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_status_stars_idx": {
+          "name": "templates_status_stars_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "stars",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_created_at_idx": {
+          "name": "templates_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_updated_at_idx": {
+          "name": "templates_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "templates_workflow_id_workflow_id_fk": {
+          "name": "templates_workflow_id_workflow_id_fk",
+          "tableFrom": "templates",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "templates_creator_id_template_creators_id_fk": {
+          "name": "templates_creator_id_template_creators_id_fk",
+          "tableFrom": "templates",
+          "tableTo": "template_creators",
+          "columnsFrom": ["creator_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.usage_log": {
+      "name": "usage_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "category": {
+          "name": "category",
+          "type": "usage_log_category",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "usage_log_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "usage_log_user_created_at_idx": {
+          "name": "usage_log_user_created_at_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_source_idx": {
+          "name": "usage_log_source_idx",
+          "columns": [
+            {
+              "expression": "source",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workspace_id_idx": {
+          "name": "usage_log_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workflow_id_idx": {
+          "name": "usage_log_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workspace_created_at_idx": {
+          "name": "usage_log_workspace_created_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "usage_log_user_id_user_id_fk": {
+          "name": "usage_log_user_id_user_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "usage_log_workspace_id_workspace_id_fk": {
+          "name": "usage_log_workspace_id_workspace_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "usage_log_workflow_id_workflow_id_fk": {
+          "name": "usage_log_workflow_id_workflow_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "normalized_email": {
+          "name": "normalized_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'user'"
+        },
+        "banned": {
+          "name": "banned",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "ban_reason": {
+          "name": "ban_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ban_expires": {
+          "name": "ban_expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        },
+        "user_normalized_email_unique": {
+          "name": "user_normalized_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["normalized_email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_stats": {
+      "name": "user_stats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_manual_executions": {
+          "name": "total_manual_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_api_calls": {
+          "name": "total_api_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_webhook_triggers": {
+          "name": "total_webhook_triggers",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_scheduled_executions": {
+          "name": "total_scheduled_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_chat_executions": {
+          "name": "total_chat_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_executions": {
+          "name": "total_mcp_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_a2a_executions": {
+          "name": "total_a2a_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_tokens_used": {
+          "name": "total_tokens_used",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_usage_limit": {
+          "name": "current_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'5'"
+        },
+        "usage_limit_updated_at": {
+          "name": "usage_limit_updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "current_period_cost": {
+          "name": "current_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_cost": {
+          "name": "last_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "billed_overage_this_period": {
+          "name": "billed_overage_this_period",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "pro_period_cost_snapshot": {
+          "name": "pro_period_cost_snapshot",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "pro_period_cost_snapshot_at": {
+          "name": "pro_period_cost_snapshot_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "total_copilot_cost": {
+          "name": "total_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_copilot_cost": {
+          "name": "current_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_copilot_cost": {
+          "name": "last_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "total_copilot_tokens": {
+          "name": "total_copilot_tokens",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_copilot_calls": {
+          "name": "total_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_calls": {
+          "name": "total_mcp_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_cost": {
+          "name": "total_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_mcp_copilot_cost": {
+          "name": "current_period_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_active": {
+          "name": "last_active",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "billing_blocked": {
+          "name": "billing_blocked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "billing_blocked_reason": {
+          "name": "billing_blocked_reason",
+          "type": "billing_blocked_reason",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_stats_user_id_user_id_fk": {
+          "name": "user_stats_user_id_user_id_fk",
+          "tableFrom": "user_stats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_stats_user_id_unique": {
+          "name": "user_stats_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_definitions": {
+      "name": "user_table_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "schema": {
+          "name": "schema",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_rows": {
+          "name": "max_rows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10000
+        },
+        "row_count": {
+          "name": "row_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "user_table_def_workspace_id_idx": {
+          "name": "user_table_def_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_workspace_name_unique": {
+          "name": "user_table_def_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"user_table_definitions\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_archived_at_idx": {
+          "name": "user_table_def_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_workspace_archived_partial_idx": {
+          "name": "user_table_def_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"user_table_definitions\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_definitions_workspace_id_workspace_id_fk": {
+          "name": "user_table_definitions_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_definitions_created_by_user_id_fk": {
+          "name": "user_table_definitions_created_by_user_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_rows": {
+      "name": "user_table_rows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "user_table_rows_table_id_idx": {
+          "name": "user_table_rows_table_id_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_data_gin_idx": {
+          "name": "user_table_rows_data_gin_idx",
+          "columns": [
+            {
+              "expression": "data",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "user_table_rows_workspace_table_idx": {
+          "name": "user_table_rows_workspace_table_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_table_position_idx": {
+          "name": "user_table_rows_table_position_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "position",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_rows_table_id_user_table_definitions_id_fk": {
+          "name": "user_table_rows_table_id_user_table_definitions_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_workspace_id_workspace_id_fk": {
+          "name": "user_table_rows_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_created_by_user_id_fk": {
+          "name": "user_table_rows_created_by_user_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.verification": {
+      "name": "verification",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "verification_identifier_idx": {
+          "name": "verification_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "verification_expires_at_idx": {
+          "name": "verification_expires_at_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.waitlist": {
+      "name": "waitlist",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "waitlist_email_unique": {
+          "name": "waitlist_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.webhook": {
+      "name": "webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_config": {
+          "name": "provider_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "path_deployment_unique": {
+          "name": "path_deployment_unique",
+          "columns": [
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"webhook\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_webhook_on_workflow_id_block_id": {
+          "name": "idx_webhook_on_workflow_id_block_id",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_workflow_deployment_idx": {
+          "name": "webhook_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_credential_set_id_idx": {
+          "name": "webhook_credential_set_id_idx",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_archived_at_partial_idx": {
+          "name": "webhook_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"webhook\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "webhook_workflow_id_workflow_id_fk": {
+          "name": "webhook_workflow_id_workflow_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "webhook_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "webhook_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "webhook_credential_set_id_credential_set_id_fk": {
+          "name": "webhook_credential_set_id_credential_set_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow": {
+      "name": "workflow",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#3972F6'"
+        },
+        "last_synced": {
+          "name": "last_synced",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_deployed": {
+          "name": "is_deployed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deployed_at": {
+          "name": "deployed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public_api": {
+          "name": "is_public_api",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_user_id_idx": {
+          "name": "workflow_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_id_idx": {
+          "name": "workflow_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_user_workspace_idx": {
+          "name": "workflow_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_folder_name_active_unique": {
+          "name": "workflow_workspace_folder_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"folder_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_sort_idx": {
+          "name": "workflow_folder_sort_idx",
+          "columns": [
+            {
+              "expression": "folder_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_archived_at_idx": {
+          "name": "workflow_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_archived_partial_idx": {
+          "name": "workflow_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_user_id_user_id_fk": {
+          "name": "workflow_user_id_user_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_workspace_id_workspace_id_fk": {
+          "name": "workflow_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_id_workflow_folder_id_fk": {
+          "name": "workflow_folder_id_workflow_folder_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workflow_folder",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_blocks": {
+      "name": "workflow_blocks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_x": {
+          "name": "position_x",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_y": {
+          "name": "position_y",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "horizontal_handles": {
+          "name": "horizontal_handles",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "is_wide": {
+          "name": "is_wide",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "advanced_mode": {
+          "name": "advanced_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "trigger_mode": {
+          "name": "trigger_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "height": {
+          "name": "height",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "sub_blocks": {
+          "name": "sub_blocks",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "outputs": {
+          "name": "outputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_blocks_workflow_id_idx": {
+          "name": "workflow_blocks_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_blocks_type_idx": {
+          "name": "workflow_blocks_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_blocks_workflow_id_workflow_id_fk": {
+          "name": "workflow_blocks_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_blocks",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_checkpoints": {
+      "name": "workflow_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message_id": {
+          "name": "message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_state": {
+          "name": "workflow_state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_checkpoints_user_id_idx": {
+          "name": "workflow_checkpoints_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_id_idx": {
+          "name": "workflow_checkpoints_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_id_idx": {
+          "name": "workflow_checkpoints_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_message_id_idx": {
+          "name": "workflow_checkpoints_message_id_idx",
+          "columns": [
+            {
+              "expression": "message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_user_workflow_idx": {
+          "name": "workflow_checkpoints_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_chat_idx": {
+          "name": "workflow_checkpoints_workflow_chat_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_created_at_idx": {
+          "name": "workflow_checkpoints_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_created_at_idx": {
+          "name": "workflow_checkpoints_chat_created_at_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_checkpoints_user_id_user_id_fk": {
+          "name": "workflow_checkpoints_user_id_user_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_workflow_id_workflow_id_fk": {
+          "name": "workflow_checkpoints_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_chat_id_copilot_chats_id_fk": {
+          "name": "workflow_checkpoints_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_deployment_version": {
+      "name": "workflow_deployment_version",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_deployment_version_workflow_version_unique": {
+          "name": "workflow_deployment_version_workflow_version_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_workflow_active_idx": {
+          "name": "workflow_deployment_version_workflow_active_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_created_at_idx": {
+          "name": "workflow_deployment_version_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_deployment_version_workflow_id_workflow_id_fk": {
+          "name": "workflow_deployment_version_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_deployment_version",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_edges": {
+      "name": "workflow_edges",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_block_id": {
+          "name": "source_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_block_id": {
+          "name": "target_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_handle": {
+          "name": "source_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "target_handle": {
+          "name": "target_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_edges_workflow_id_idx": {
+          "name": "workflow_edges_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_source_idx": {
+          "name": "workflow_edges_workflow_source_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "source_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_target_idx": {
+          "name": "workflow_edges_workflow_target_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_edges_workflow_id_workflow_id_fk": {
+          "name": "workflow_edges_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_source_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_source_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["source_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_target_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_target_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["target_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_logs": {
+      "name": "workflow_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_snapshot_id": {
+          "name": "state_snapshot_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "files": {
+          "name": "files",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_execution_logs_workflow_id_idx": {
+          "name": "workflow_execution_logs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_state_snapshot_id_idx": {
+          "name": "workflow_execution_logs_state_snapshot_id_idx",
+          "columns": [
+            {
+              "expression": "state_snapshot_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_deployment_version_id_idx": {
+          "name": "workflow_execution_logs_deployment_version_id_idx",
+          "columns": [
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_trigger_idx": {
+          "name": "workflow_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_level_idx": {
+          "name": "workflow_execution_logs_level_idx",
+          "columns": [
+            {
+              "expression": "level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_started_at_idx": {
+          "name": "workflow_execution_logs_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_execution_id_unique": {
+          "name": "workflow_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workflow_started_at_idx": {
+          "name": "workflow_execution_logs_workflow_started_at_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_started_at_idx": {
+          "name": "workflow_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_ended_at_id_idx": {
+          "name": "workflow_execution_logs_workspace_ended_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"ended_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_running_started_at_idx": {
+          "name": "workflow_execution_logs_running_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "status = 'running'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_logs_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_logs_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "workflow_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk": {
+          "name": "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_execution_snapshots",
+          "columnsFrom": ["state_snapshot_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_snapshots": {
+      "name": "workflow_execution_snapshots",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state_hash": {
+          "name": "state_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_data": {
+          "name": "state_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_snapshots_workflow_id_idx": {
+          "name": "workflow_snapshots_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_hash_idx": {
+          "name": "workflow_snapshots_hash_idx",
+          "columns": [
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_workflow_hash_idx": {
+          "name": "workflow_snapshots_workflow_hash_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_created_at_idx": {
+          "name": "workflow_snapshots_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_snapshots_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_snapshots_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_snapshots",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_folder": {
+      "name": "workflow_folder",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'#6B7280'"
+        },
+        "is_expanded": {
+          "name": "is_expanded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_folder_user_idx": {
+          "name": "workflow_folder_user_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_parent_idx": {
+          "name": "workflow_folder_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_parent_sort_idx": {
+          "name": "workflow_folder_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_archived_at_idx": {
+          "name": "workflow_folder_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_archived_partial_idx": {
+          "name": "workflow_folder_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_folder\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_folder_user_id_user_id_fk": {
+          "name": "workflow_folder_user_id_user_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_workspace_id_workspace_id_fk": {
+          "name": "workflow_folder_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_server": {
+      "name": "workflow_mcp_server",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public": {
+          "name": "is_public",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_server_workspace_id_idx": {
+          "name": "workflow_mcp_server_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_created_by_idx": {
+          "name": "workflow_mcp_server_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_deleted_at_idx": {
+          "name": "workflow_mcp_server_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_workspace_deleted_partial_idx": {
+          "name": "workflow_mcp_server_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_mcp_server\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_server_workspace_id_workspace_id_fk": {
+          "name": "workflow_mcp_server_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_server_created_by_user_id_fk": {
+          "name": "workflow_mcp_server_created_by_user_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_tool": {
+      "name": "workflow_mcp_tool",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "server_id": {
+          "name": "server_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_description": {
+          "name": "tool_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parameter_schema": {
+          "name": "parameter_schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_tool_server_id_idx": {
+          "name": "workflow_mcp_tool_server_id_idx",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_workflow_id_idx": {
+          "name": "workflow_mcp_tool_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_server_workflow_unique": {
+          "name": "workflow_mcp_tool_server_workflow_unique",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_mcp_tool\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_archived_at_partial_idx": {
+          "name": "workflow_mcp_tool_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_mcp_tool\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk": {
+          "name": "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow_mcp_server",
+          "columnsFrom": ["server_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_tool_workflow_id_workflow_id_fk": {
+          "name": "workflow_mcp_tool_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_schedule": {
+      "name": "workflow_schedule",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cron_expression": {
+          "name": "cron_expression",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_ran_at": {
+          "name": "last_ran_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_queued_at": {
+          "name": "last_queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "timezone": {
+          "name": "timezone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'UTC'"
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_type": {
+          "name": "source_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'workflow'"
+        },
+        "job_title": {
+          "name": "job_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "prompt": {
+          "name": "prompt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lifecycle": {
+          "name": "lifecycle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'persistent'"
+        },
+        "success_condition": {
+          "name": "success_condition",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_runs": {
+          "name": "max_runs",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "source_chat_id": {
+          "name": "source_chat_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_task_name": {
+          "name": "source_task_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_user_id": {
+          "name": "source_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_workspace_id": {
+          "name": "source_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_history": {
+          "name": "job_history",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_schedule_workflow_block_deployment_unique": {
+          "name": "workflow_schedule_workflow_block_deployment_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_workflow_deployment_idx": {
+          "name": "workflow_schedule_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_archived_at_partial_idx": {
+          "name": "workflow_schedule_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_schedule_workflow_id_workflow_id_fk": {
+          "name": "workflow_schedule_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_user_id_user_id_fk": {
+          "name": "workflow_schedule_source_user_id_user_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "user",
+          "columnsFrom": ["source_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_workspace_id_workspace_id_fk": {
+          "name": "workflow_schedule_source_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workspace",
+          "columnsFrom": ["source_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_subflows": {
+      "name": "workflow_subflows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_subflows_workflow_id_idx": {
+          "name": "workflow_subflows_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_subflows_workflow_type_idx": {
+          "name": "workflow_subflows_workflow_type_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_subflows_workflow_id_workflow_id_fk": {
+          "name": "workflow_subflows_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_subflows",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace": {
+      "name": "workspace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#33C482'"
+        },
+        "logo_url": {
+          "name": "logo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_mode": {
+          "name": "workspace_mode",
+          "type": "workspace_mode",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'grandfathered_shared'"
+        },
+        "billed_account_user_id": {
+          "name": "billed_account_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "allow_personal_api_keys": {
+          "name": "allow_personal_api_keys",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "inbox_enabled": {
+          "name": "inbox_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "inbox_address": {
+          "name": "inbox_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "inbox_provider_id": {
+          "name": "inbox_provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_owner_id_idx": {
+          "name": "workspace_owner_id_idx",
+          "columns": [
+            {
+              "expression": "owner_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_organization_id_idx": {
+          "name": "workspace_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_mode_idx": {
+          "name": "workspace_mode_idx",
+          "columns": [
+            {
+              "expression": "workspace_mode",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_owner_id_user_id_fk": {
+          "name": "workspace_owner_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["owner_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_organization_id_organization_id_fk": {
+          "name": "workspace_organization_id_organization_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workspace_billed_account_user_id_user_id_fk": {
+          "name": "workspace_billed_account_user_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["billed_account_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_byok_keys": {
+      "name": "workspace_byok_keys",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_byok_provider_unique": {
+          "name": "workspace_byok_provider_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_byok_workspace_idx": {
+          "name": "workspace_byok_workspace_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_byok_keys_workspace_id_workspace_id_fk": {
+          "name": "workspace_byok_keys_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_byok_keys_created_by_user_id_fk": {
+          "name": "workspace_byok_keys_created_by_user_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_environment": {
+      "name": "workspace_environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_environment_workspace_unique": {
+          "name": "workspace_environment_workspace_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_environment_workspace_id_workspace_id_fk": {
+          "name": "workspace_environment_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_environment",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_file": {
+      "name": "workspace_file",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_by": {
+          "name": "uploaded_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_file_workspace_id_idx": {
+          "name": "workspace_file_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_key_idx": {
+          "name": "workspace_file_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_deleted_at_idx": {
+          "name": "workspace_file_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_workspace_deleted_partial_idx": {
+          "name": "workspace_file_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_file\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_file_workspace_id_workspace_id_fk": {
+          "name": "workspace_file_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_uploaded_by_user_id_fk": {
+          "name": "workspace_file_uploaded_by_user_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "user",
+          "columnsFrom": ["uploaded_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_file_key_unique": {
+          "name": "workspace_file_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_file_folders": {
+      "name": "workspace_file_folders",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_file_folders_workspace_parent_idx": {
+          "name": "workspace_file_folders_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_parent_sort_idx": {
+          "name": "workspace_file_folders_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_deleted_at_idx": {
+          "name": "workspace_file_folders_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_workspace_deleted_partial_idx": {
+          "name": "workspace_file_folders_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_file_folders\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_workspace_parent_name_active_unique": {
+          "name": "workspace_file_folders_workspace_parent_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"parent_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_file_folders\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_file_folders_user_id_user_id_fk": {
+          "name": "workspace_file_folders_user_id_user_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_folders_workspace_id_workspace_id_fk": {
+          "name": "workspace_file_folders_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_folders_parent_id_workspace_file_folders_id_fk": {
+          "name": "workspace_file_folders_parent_id_workspace_file_folders_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "workspace_file_folders",
+          "columnsFrom": ["parent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_files": {
+      "name": "workspace_files",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_name": {
+          "name": "original_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_files_key_active_unique": {
+          "name": "workspace_files_key_active_unique",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_folder_name_active_unique": {
+          "name": "workspace_files_workspace_folder_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"folder_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "original_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL AND \"workspace_files\".\"context\" = 'workspace' AND \"workspace_files\".\"workspace_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_chat_display_name_unique": {
+          "name": "workspace_files_chat_display_name_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"context\" = 'mothership' AND \"workspace_files\".\"chat_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_key_idx": {
+          "name": "workspace_files_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_user_id_idx": {
+          "name": "workspace_files_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_id_idx": {
+          "name": "workspace_files_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_folder_id_idx": {
+          "name": "workspace_files_folder_id_idx",
+          "columns": [
+            {
+              "expression": "folder_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_context_idx": {
+          "name": "workspace_files_context_idx",
+          "columns": [
+            {
+              "expression": "context",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_chat_id_idx": {
+          "name": "workspace_files_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_deleted_at_idx": {
+          "name": "workspace_files_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_deleted_partial_idx": {
+          "name": "workspace_files_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_files\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_files_user_id_user_id_fk": {
+          "name": "workspace_files_user_id_user_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_workspace_id_workspace_id_fk": {
+          "name": "workspace_files_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_folder_id_workspace_file_folders_id_fk": {
+          "name": "workspace_files_folder_id_workspace_file_folders_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "workspace_file_folders",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workspace_files_chat_id_copilot_chats_id_fk": {
+          "name": "workspace_files_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_notification_delivery": {
+      "name": "workspace_notification_delivery",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "subscription_id": {
+          "name": "subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "notification_delivery_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_attempt_at": {
+          "name": "last_attempt_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_attempt_at": {
+          "name": "next_attempt_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_status": {
+          "name": "response_status",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_body": {
+          "name": "response_body",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_notification_delivery_subscription_id_idx": {
+          "name": "workspace_notification_delivery_subscription_id_idx",
+          "columns": [
+            {
+              "expression": "subscription_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_execution_id_idx": {
+          "name": "workspace_notification_delivery_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_status_idx": {
+          "name": "workspace_notification_delivery_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_next_attempt_idx": {
+          "name": "workspace_notification_delivery_next_attempt_idx",
+          "columns": [
+            {
+              "expression": "next_attempt_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_notification_delivery_subscription_id_workspace_notification_subscription_id_fk": {
+          "name": "workspace_notification_delivery_subscription_id_workspace_notification_subscription_id_fk",
+          "tableFrom": "workspace_notification_delivery",
+          "tableTo": "workspace_notification_subscription",
+          "columnsFrom": ["subscription_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_notification_delivery_workflow_id_workflow_id_fk": {
+          "name": "workspace_notification_delivery_workflow_id_workflow_id_fk",
+          "tableFrom": "workspace_notification_delivery",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_notification_subscription": {
+      "name": "workspace_notification_subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "notification_type": {
+          "name": "notification_type",
+          "type": "notification_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_ids": {
+          "name": "workflow_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "all_workflows": {
+          "name": "all_workflows",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "level_filter": {
+          "name": "level_filter",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY['info', 'error']::text[]"
+        },
+        "trigger_filter": {
+          "name": "trigger_filter",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY['api', 'webhook', 'schedule', 'manual', 'chat']::text[]"
+        },
+        "include_final_output": {
+          "name": "include_final_output",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_trace_spans": {
+          "name": "include_trace_spans",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_rate_limits": {
+          "name": "include_rate_limits",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_usage_data": {
+          "name": "include_usage_data",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "webhook_config": {
+          "name": "webhook_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_recipients": {
+          "name": "email_recipients",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "slack_config": {
+          "name": "slack_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alert_config": {
+          "name": "alert_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_alert_at": {
+          "name": "last_alert_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "active": {
+          "name": "active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_notification_workspace_id_idx": {
+          "name": "workspace_notification_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_active_idx": {
+          "name": "workspace_notification_active_idx",
+          "columns": [
+            {
+              "expression": "active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_type_idx": {
+          "name": "workspace_notification_type_idx",
+          "columns": [
+            {
+              "expression": "notification_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_notification_subscription_workspace_id_workspace_id_fk": {
+          "name": "workspace_notification_subscription_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_notification_subscription",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_notification_subscription_created_by_user_id_fk": {
+          "name": "workspace_notification_subscription_created_by_user_id_fk",
+          "tableFrom": "workspace_notification_subscription",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.a2a_task_status": {
+      "name": "a2a_task_status",
+      "schema": "public",
+      "values": [
+        "submitted",
+        "working",
+        "input-required",
+        "completed",
+        "failed",
+        "canceled",
+        "rejected",
+        "auth-required",
+        "unknown"
+      ]
+    },
+    "public.academy_cert_status": {
+      "name": "academy_cert_status",
+      "schema": "public",
+      "values": ["active", "revoked", "expired"]
+    },
+    "public.billing_blocked_reason": {
+      "name": "billing_blocked_reason",
+      "schema": "public",
+      "values": ["payment_failed", "dispute"]
+    },
+    "public.chat_type": {
+      "name": "chat_type",
+      "schema": "public",
+      "values": ["mothership", "copilot"]
+    },
+    "public.copilot_async_tool_status": {
+      "name": "copilot_async_tool_status",
+      "schema": "public",
+      "values": ["pending", "running", "completed", "failed", "cancelled", "delivered"]
+    },
+    "public.copilot_run_status": {
+      "name": "copilot_run_status",
+      "schema": "public",
+      "values": ["active", "paused_waiting_for_tool", "resuming", "complete", "error", "cancelled"]
+    },
+    "public.credential_member_role": {
+      "name": "credential_member_role",
+      "schema": "public",
+      "values": ["admin", "member"]
+    },
+    "public.credential_member_status": {
+      "name": "credential_member_status",
+      "schema": "public",
+      "values": ["active", "pending", "revoked"]
+    },
+    "public.credential_set_invitation_status": {
+      "name": "credential_set_invitation_status",
+      "schema": "public",
+      "values": ["pending", "accepted", "expired", "cancelled"]
+    },
+    "public.credential_set_member_status": {
+      "name": "credential_set_member_status",
+      "schema": "public",
+      "values": ["active", "pending", "revoked"]
+    },
+    "public.credential_type": {
+      "name": "credential_type",
+      "schema": "public",
+      "values": ["oauth", "env_workspace", "env_personal", "service_account"]
+    },
+    "public.data_drain_cadence": {
+      "name": "data_drain_cadence",
+      "schema": "public",
+      "values": ["hourly", "daily"]
+    },
+    "public.data_drain_destination": {
+      "name": "data_drain_destination",
+      "schema": "public",
+      "values": ["s3", "gcs", "azure_blob", "datadog", "bigquery", "snowflake", "webhook"]
+    },
+    "public.data_drain_run_status": {
+      "name": "data_drain_run_status",
+      "schema": "public",
+      "values": ["running", "success", "failed"]
+    },
+    "public.data_drain_run_trigger": {
+      "name": "data_drain_run_trigger",
+      "schema": "public",
+      "values": ["cron", "manual"]
+    },
+    "public.data_drain_source": {
+      "name": "data_drain_source",
+      "schema": "public",
+      "values": ["workflow_logs", "job_logs", "audit_logs", "copilot_chats", "copilot_runs"]
+    },
+    "public.invitation_kind": {
+      "name": "invitation_kind",
+      "schema": "public",
+      "values": ["organization", "workspace"]
+    },
+    "public.invitation_membership_intent": {
+      "name": "invitation_membership_intent",
+      "schema": "public",
+      "values": ["internal", "external"]
+    },
+    "public.invitation_status": {
+      "name": "invitation_status",
+      "schema": "public",
+      "values": ["pending", "accepted", "rejected", "cancelled", "expired"]
+    },
+    "public.notification_delivery_status": {
+      "name": "notification_delivery_status",
+      "schema": "public",
+      "values": ["pending", "in_progress", "success", "failed"]
+    },
+    "public.notification_type": {
+      "name": "notification_type",
+      "schema": "public",
+      "values": ["webhook", "email", "slack"]
+    },
+    "public.permission_type": {
+      "name": "permission_type",
+      "schema": "public",
+      "values": ["admin", "write", "read"]
+    },
+    "public.template_creator_type": {
+      "name": "template_creator_type",
+      "schema": "public",
+      "values": ["user", "organization"]
+    },
+    "public.template_status": {
+      "name": "template_status",
+      "schema": "public",
+      "values": ["pending", "approved", "rejected"]
+    },
+    "public.usage_log_category": {
+      "name": "usage_log_category",
+      "schema": "public",
+      "values": ["model", "fixed"]
+    },
+    "public.usage_log_source": {
+      "name": "usage_log_source",
+      "schema": "public",
+      "values": [
+        "workflow",
+        "wand",
+        "copilot",
+        "workspace-chat",
+        "mcp_copilot",
+        "mothership_block",
+        "knowledge-base",
+        "voice-input"
+      ]
+    },
+    "public.workspace_mode": {
+      "name": "workspace_mode",
+      "schema": "public",
+      "values": ["personal", "organization", "grandfathered_shared"]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/packages/db/migrations/meta/_journal.json b/packages/db/migrations/meta/_journal.json
index 1dd9764d85e..6985b5a89b5 100644
--- a/packages/db/migrations/meta/_journal.json
+++ b/packages/db/migrations/meta/_journal.json
@@ -1464,6 +1464,13 @@
       "when": 1779246572978,
       "tag": "0209_smiling_fixer",
       "breakpoints": true
+    },
+    {
+      "idx": 210,
+      "version": "7",
+      "when": 1779299303134,
+      "tag": "0210_mcp_oauth",
+      "breakpoints": true
     }
   ]
 }
diff --git a/packages/db/schema.ts b/packages/db/schema.ts
index fe2913d3c89..b133125fc38 100644
--- a/packages/db/schema.ts
+++ b/packages/db/schema.ts
@@ -2211,6 +2211,14 @@ export const mcpServers = pgTable(
     transport: text('transport').notNull(),
     url: text('url'),
 
+    authType: text('auth_type').notNull().default('headers'),
+    /**
+     * Optional pre-registered OAuth credentials for servers that don't
+     * support Dynamic Client Registration (RFC 7591). When set, these
+     * shortcut the SDK's DCR step. `oauthClientSecret` is encrypted.
+     */
+    oauthClientId: text('oauth_client_id'),
+    oauthClientSecret: text('oauth_client_secret'),
     headers: json('headers').default('{}'),
     timeout: integer('timeout').default(30000),
     retries: integer('retries').default(3),
@@ -2246,6 +2254,60 @@ export const mcpServers = pgTable(
   })
 )
 
+/**
+ * Workspace-scoped OAuth state for an outbound MCP server.
+ *
+ * Holds the SDK-managed OAuth artifacts needed to drive the standard MCP
+ * OAuth 2.1 + PKCE + dynamic-client-registration flow against a remote MCP
+ * server. One row per MCP server; workspace members share the authorized
+ * connection just like they share the MCP server definition.
+ */
+export const mcpServerOauth = pgTable(
+  'mcp_server_oauth',
+  {
+    id: text('id').primaryKey(),
+    mcpServerId: text('mcp_server_id')
+      .notNull()
+      .references(() => mcpServers.id, { onDelete: 'cascade' }),
+    /** Last workspace user who initiated/completed authorization. */
+    userId: text('user_id').references(() => user.id, { onDelete: 'set null' }),
+    workspaceId: text('workspace_id')
+      .notNull()
+      .references(() => workspace.id, { onDelete: 'cascade' }),
+
+    /**
+     * Encrypted JSON of the RFC 7591 dynamic client registration result.
+     * Encrypted because some authorization servers may issue a client_secret
+     * even for clients advertising `token_endpoint_auth_method: 'none'`.
+     */
+    clientInformation: text('client_information'),
+
+    /** Encrypted JSON of the OAuth tokens (access + refresh). */
+    tokens: text('tokens'),
+
+    /** PKCE verifier held only between /authorize and /callback. */
+    codeVerifier: text('code_verifier'),
+
+    /** Opaque state mint to correlate the callback. */
+    state: text('state'),
+
+    /**
+     * When `state` was minted. Used to expire the active-flow window and the
+     * state replay window independently of `updatedAt`, which is touched by
+     * token refreshes and other writes.
+     */
+    stateCreatedAt: timestamp('state_created_at'),
+
+    lastRefreshedAt: timestamp('last_refreshed_at'),
+    createdAt: timestamp('created_at').notNull().defaultNow(),
+    updatedAt: timestamp('updated_at').notNull().defaultNow(),
+  },
+  (table) => ({
+    serverUnique: uniqueIndex('mcp_server_oauth_server_unique').on(table.mcpServerId),
+    stateIdx: index('mcp_server_oauth_state_idx').on(table.state),
+  })
+)
+
 // SSO Provider table
 export const ssoProvider = pgTable(
   'sso_provider',
diff --git a/packages/testing/src/mocks/index.ts b/packages/testing/src/mocks/index.ts
index c945ebf3bfc..e8e4de49e24 100644
--- a/packages/testing/src/mocks/index.ts
+++ b/packages/testing/src/mocks/index.ts
@@ -84,6 +84,13 @@ export {
   loggingSessionMock,
   loggingSessionMockFns,
 } from './logging-session.mock'
+// MCP OAuth mocks (for @/lib/mcp/oauth)
+export {
+  McpOauthInsecureUrlErrorMock,
+  McpOauthRedirectRequiredMock,
+  mcpOauthMock,
+  mcpOauthMockFns,
+} from './mcp-oauth.mock'
 // Permission mocks
 export { permissionsMock, permissionsMockFns } from './permissions.mock'
 // PostHog server mocks (for @/lib/posthog/server)
diff --git a/packages/testing/src/mocks/mcp-oauth.mock.ts b/packages/testing/src/mocks/mcp-oauth.mock.ts
new file mode 100644
index 00000000000..bf23bdf6509
--- /dev/null
+++ b/packages/testing/src/mocks/mcp-oauth.mock.ts
@@ -0,0 +1,74 @@
+import { vi } from 'vitest'
+
+/**
+ * Controllable mock functions for `@/lib/mcp/oauth`.
+ *
+ * @example
+ * ```ts
+ * import { mcpOauthMockFns } from '@sim/testing'
+ *
+ * mcpOauthMockFns.mockGetOrCreateOauthRow.mockResolvedValue({ id: 'oauth-row-1', ... })
+ * ```
+ */
+export const mcpOauthMockFns = {
+  mockAssertSafeOauthServerUrl: vi.fn(),
+  mockGetOrCreateOauthRow: vi.fn(),
+  mockLoadOauthRow: vi.fn(),
+  mockLoadOauthRowByState: vi.fn(),
+  mockLoadPreregisteredClient: vi.fn(),
+  mockSetOauthRowUser: vi.fn(),
+  mockSaveClientInformation: vi.fn(),
+  mockSaveTokens: vi.fn(),
+  mockSaveCodeVerifier: vi.fn(),
+  mockSaveState: vi.fn(),
+  mockClearTokens: vi.fn(),
+  mockClearClient: vi.fn(),
+  mockClearVerifier: vi.fn(),
+  mockClearState: vi.fn(),
+  mockRevokeMcpOauthTokens: vi.fn(),
+  mockWithMcpOauthRefreshLock: vi.fn(async (_rowId: string, fn: () => Promise<unknown>) => fn()),
+}
+
+export class McpOauthRedirectRequiredMock extends Error {
+  constructor(public readonly authorizationUrl: string) {
+    super('MCP OAuth redirect required')
+    this.name = 'McpOauthRedirectRequiredMock'
+  }
+}
+
+export class McpOauthInsecureUrlErrorMock extends Error {
+  constructor(public readonly url: string) {
+    super(`Insecure MCP OAuth server URL: ${url}`)
+    this.name = 'McpOauthInsecureUrlErrorMock'
+  }
+}
+
+/**
+ * Static mock module for `@/lib/mcp/oauth`.
+ *
+ * @example
+ * ```ts
+ * vi.mock('@/lib/mcp/oauth', () => mcpOauthMock)
+ * ```
+ */
+export const mcpOauthMock = {
+  assertSafeOauthServerUrl: mcpOauthMockFns.mockAssertSafeOauthServerUrl,
+  getOrCreateOauthRow: mcpOauthMockFns.mockGetOrCreateOauthRow,
+  loadOauthRow: mcpOauthMockFns.mockLoadOauthRow,
+  loadOauthRowByState: mcpOauthMockFns.mockLoadOauthRowByState,
+  loadPreregisteredClient: mcpOauthMockFns.mockLoadPreregisteredClient,
+  setOauthRowUser: mcpOauthMockFns.mockSetOauthRowUser,
+  saveClientInformation: mcpOauthMockFns.mockSaveClientInformation,
+  saveTokens: mcpOauthMockFns.mockSaveTokens,
+  saveCodeVerifier: mcpOauthMockFns.mockSaveCodeVerifier,
+  saveState: mcpOauthMockFns.mockSaveState,
+  clearTokens: mcpOauthMockFns.mockClearTokens,
+  clearClient: mcpOauthMockFns.mockClearClient,
+  clearVerifier: mcpOauthMockFns.mockClearVerifier,
+  clearState: mcpOauthMockFns.mockClearState,
+  revokeMcpOauthTokens: mcpOauthMockFns.mockRevokeMcpOauthTokens,
+  withMcpOauthRefreshLock: mcpOauthMockFns.mockWithMcpOauthRefreshLock,
+  McpOauthRedirectRequired: McpOauthRedirectRequiredMock,
+  McpOauthInsecureUrlError: McpOauthInsecureUrlErrorMock,
+  SimMcpOauthProvider: vi.fn().mockImplementation((value) => value),
+}
diff --git a/packages/testing/src/mocks/schema.mock.ts b/packages/testing/src/mocks/schema.mock.ts
index 66e14fabe0c..bcd62e17293 100644
--- a/packages/testing/src/mocks/schema.mock.ts
+++ b/packages/testing/src/mocks/schema.mock.ts
@@ -870,6 +870,19 @@ export const schemaMock = {
     createdAt: 'createdAt',
     updatedAt: 'updatedAt',
   },
+  mcpServerOauth: {
+    id: 'id',
+    mcpServerId: 'mcpServerId',
+    userId: 'userId',
+    workspaceId: 'workspaceId',
+    clientInformation: 'clientInformation',
+    tokens: 'tokens',
+    codeVerifier: 'codeVerifier',
+    state: 'state',
+    lastRefreshedAt: 'lastRefreshedAt',
+    createdAt: 'createdAt',
+    updatedAt: 'updatedAt',
+  },
   ssoProvider: {
     id: 'id',
     issuer: 'issuer',
diff --git a/scripts/check-api-validation-contracts.ts b/scripts/check-api-validation-contracts.ts
index 3f8b4f77c87..3dc81bfbec5 100644
--- a/scripts/check-api-validation-contracts.ts
+++ b/scripts/check-api-validation-contracts.ts
@@ -9,8 +9,8 @@ const QUERY_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/queries')
 const SELECTOR_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/selectors')
 
 const BASELINE = {
-  totalRoutes: 747,
-  zodRoutes: 747,
+  totalRoutes: 749,
+  zodRoutes: 749,
   nonZodRoutes: 0,
 } as const
 
@@ -79,6 +79,10 @@ const INDIRECT_ZOD_ROUTES = new Set([
   // MCP routes that take only auth context (no client-supplied params/query/body).
   'apps/sim/app/api/mcp/discover/route.ts',
   'apps/sim/app/api/mcp/tools/stored/route.ts',
+  // MCP OAuth callback is the provider redirect target — the response is HTML
+  // that closes the popup, so the JSON-mode contract framework doesn't fit.
+  // Validation is enforced via state lookup + session-vs-row userId match.
+  'apps/sim/app/api/mcp/oauth/callback/route.ts',
 ])
 
 /**

From af8025c411ffe3a873a6f30bcdf4dddb086be5f2 Mon Sep 17 00:00:00 2001
From: Theodore Li <theo@sim.ai>
Date: Wed, 20 May 2026 12:15:45 -0700
Subject: [PATCH 04/16] fix(table): dispatcher cold-start, live run counter,
 smooth typewriter (#4675)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(table): cut dispatcher cold-start by lazy-loading heavy import chains

The trigger.dev table-run-dispatcher spent ~6s in module init before its
first batchTriggerAndWait — it imports lib/table/service for getTableById,
which eagerly imported lib/table/trigger → @/lib/webhooks/processor →
webhook-execution + executor, dragging the entire workflow-execution stack
into the dispatcher container even though it never fires a trigger.

- trigger.ts lazy-imports the webhook processor + polling utils inside
  fireTableTrigger (the only consumer), so importing service no longer pulls
  the executor.
- buildEnqueueItems only imports the cell job (for the inline `runner`) on the
  database backend; the trigger.dev backend triggers by task id and ignores
  runner.

* fix(table): run counter + gutter Stop update instantly on Run

The "X running" badge, per-row gutter Stop button, and runningByRowId map
stayed at zero after clicking Run until a manual refetch. useRunColumn
optimistically stamped cells pending in the rows cache but never bumped the
activeDispatches counter — so when the dispatcher's real pending SSE arrived,
applyCell saw the cell was already in-flight (wasInFlight === isInFlight) and
skipped the counter delta. The optimistic stamp ate the transition.

- onMutate now bumps runningCellCount / runningByRowId by the cells it stamps,
  snapshotting prior run-state for rollback on error.
- onSuccess seeds the dispatch into the overlay list from the response instead
  of invalidating activeDispatches (a refetch would reset the optimistic
  counter to the server's still-zero count before the dispatcher stamps).

* fix(table): drive cell typewriter with rAF so concurrent reveals stay smooth

The character-by-character reveal used a per-cell setInterval. When many cells
reveal at once (a Run-all completing in waves), the independent interval
callbacks fire at uncoordinated times and each forces its own render +
layout/paint — O(cells) reflows over an un-virtualized grid, so it degrades as
more cells fill. Switch to requestAnimationFrame: all cells' callbacks run
before one paint, so React batches them into a single render + paint per frame
regardless of cell count. Reveal length is derived from elapsed time, so a
dropped frame catches up instead of slowing the animation.

* fix(table): roll back optimistic run counter when no dispatch is created

useRunColumn.onSuccess returned early on a null dispatchId (no matching
groups / eligible rows) without undoing the onMutate counter bump — and no
SSE would arrive to correct it, leaving the counter permanently inflated.
Restore the pre-mutation run-state on that path, mirroring onError.

* chore(table): tighten inline comments on dispatcher cold-start fixes
---
 .../table-grid/cells/cell-render.tsx          | 21 ++++--
 apps/sim/hooks/queries/tables.ts              | 70 ++++++++++++++++---
 apps/sim/lib/table/trigger.ts                 |  8 ++-
 apps/sim/lib/table/workflow-columns.ts        | 13 +++-
 4 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
index 6d63bca978b..7201a3f7d23 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
@@ -296,6 +296,10 @@ const TYPEWRITER_MS_PER_CHAR = 15
  * value statically — animation fires only for subsequent updates, which in
  * practice means SSE-driven workflow completions arriving via
  * `useTableEventStream → applyCell()`.
+ *
+ * rAF-driven (not `setInterval`) so concurrent reveals batch into one
+ * render/paint per frame instead of O(cells) uncoordinated reflows; reveal
+ * length is elapsed-time based so dropped frames catch up rather than slow.
  */
 function useTypewriter(text: string | null): string | null {
   const [revealed, setRevealed] = useState<string | null>(text)
@@ -317,14 +321,17 @@ function useTypewriter(text: string | null): string | null {
       return
     }
 
+    const full = text
+    const start = performance.now()
+    let raf = 0
+    const tick = (now: number) => {
+      const chars = Math.min(full.length, Math.floor((now - start) / TYPEWRITER_MS_PER_CHAR))
+      setRevealed(full.slice(0, chars))
+      if (chars < full.length) raf = requestAnimationFrame(tick)
+    }
     setRevealed('')
-    let i = 0
-    const id = window.setInterval(() => {
-      i++
-      setRevealed(text.slice(0, i))
-      if (i >= text.length) window.clearInterval(id)
-    }, TYPEWRITER_MS_PER_CHAR)
-    return () => window.clearInterval(id)
+    raf = requestAnimationFrame(tick)
+    return () => cancelAnimationFrame(raf)
   }, [text])
 
   return revealed
diff --git a/apps/sim/hooks/queries/tables.ts b/apps/sim/hooks/queries/tables.ts
index 90ba8777a7b..afd799e8a08 100644
--- a/apps/sim/hooks/queries/tables.ts
+++ b/apps/sim/hooks/queries/tables.ts
@@ -1336,10 +1336,12 @@ export function useRunColumn({ workspaceId, tableId }: RowMutationContext) {
         queryClient.getQueryData<TableDefinition>(tableKeys.detail(tableId))?.schema
           .workflowGroups ?? []
       const groupsById = new Map(groups.map((g) => [g.id, g]))
+      // Tally cells stamped per row to bump the run-state counter in lockstep.
+      const stampedByRow: Record<string, number> = {}
       const snapshots = await snapshotAndMutateRows(queryClient, tableId, (r) => {
         if (targetRowIds && !targetRowIds.has(r.id)) return null
         const executions = r.executions ?? {}
-        let changed = false
+        let stamped = 0
         const next: RowExecutions = { ...executions }
         const nextData = { ...r.data }
         for (const groupId of targetGroupIds) {
@@ -1367,20 +1369,72 @@ export function useRunColumn({ workspaceId, tableId }: RowMutationContext) {
               if (o.columnName in nextData) nextData[o.columnName] = null
             }
           }
-          changed = true
+          stamped++
         }
-        if (!changed) return null
+        if (stamped === 0) return null
+        stampedByRow[r.id] = stamped
         return { ...r, data: nextData, executions: next }
       })
-      return { snapshots }
+
+      // Bump the counter to match the stamped cells. Without it the "X running"
+      // badge + gutter Stop stay at zero until a refetch: the optimistic stamp
+      // already marks the cell in-flight, so the dispatcher's `pending` SSE
+      // sees no `wasInFlight` transition and never bumps the counter.
+      const runStateSnapshot = queryClient.getQueryData<TableRunState>(
+        tableKeys.activeDispatches(tableId)
+      )
+      const totalStamped = Object.values(stampedByRow).reduce((s, n) => s + n, 0)
+      if (totalStamped > 0) {
+        queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
+          const base = prev ?? { dispatches: [], runningCellCount: 0, runningByRowId: {} }
+          const nextByRow = { ...base.runningByRowId }
+          for (const [rid, n] of Object.entries(stampedByRow)) {
+            nextByRow[rid] = (nextByRow[rid] ?? 0) + n
+          }
+          return {
+            ...base,
+            runningCellCount: base.runningCellCount + totalStamped,
+            runningByRowId: nextByRow,
+          }
+        })
+      }
+      return { snapshots, runStateSnapshot, didBumpRunState: totalStamped > 0 }
     },
     onError: (_err, _variables, context) => {
       if (context?.snapshots) restoreCachedWorkflowCells(queryClient, context.snapshots)
+      // Roll back the optimistic counter bump (snapshot may be undefined).
+      if (context?.didBumpRunState) {
+        queryClient.setQueryData(tableKeys.activeDispatches(tableId), context.runStateSnapshot)
+      }
     },
-    onSuccess: () => {
-      // Seed the active-dispatch overlay immediately (insertDispatch ran
-      // server-side before responding); rows cache stays owned by SSE.
-      void queryClient.invalidateQueries({ queryKey: tableKeys.activeDispatches(tableId) })
+    onSuccess: (data, { groupIds, runMode = 'all', rowIds }, context) => {
+      // Seed the dispatch into the overlay (drives resolveCellExec for
+      // ahead-of-cursor rows) from the response — refetching would reset the
+      // optimistic counter to the server's still-zero count.
+      const dispatchId = data?.data?.dispatchId
+      if (!dispatchId) {
+        // No dispatch created → no SSE to reconcile the bump; roll it back.
+        if (context?.didBumpRunState) {
+          queryClient.setQueryData(tableKeys.activeDispatches(tableId), context.runStateSnapshot)
+        }
+        return
+      }
+      queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
+        const base = prev ?? { dispatches: [], runningCellCount: 0, runningByRowId: {} }
+        if (base.dispatches.some((d) => d.id === dispatchId)) return base
+        const dispatch: ActiveDispatch = {
+          id: dispatchId,
+          status: 'pending',
+          mode: runMode,
+          isManualRun: true,
+          cursor: -1,
+          scope: {
+            groupIds,
+            ...(rowIds && rowIds.length > 0 ? { rowIds } : {}),
+          },
+        }
+        return { ...base, dispatches: [...base.dispatches, dispatch] }
+      })
     },
   })
 }
diff --git a/apps/sim/lib/table/trigger.ts b/apps/sim/lib/table/trigger.ts
index 32ece5e7111..2d7a9f3604d 100644
--- a/apps/sim/lib/table/trigger.ts
+++ b/apps/sim/lib/table/trigger.ts
@@ -9,8 +9,6 @@
 import { createLogger } from '@sim/logger'
 import { generateShortId } from '@sim/utils/id'
 import type { RowData, TableRow, TableSchema } from '@/lib/table/types'
-import { fetchActiveWebhooks } from '@/lib/webhooks/polling/utils'
-import { processPolledWebhookEvent } from '@/lib/webhooks/processor'
 
 const logger = createLogger('TableTrigger')
 
@@ -57,6 +55,10 @@ export async function fireTableTrigger(
   requestId: string
 ): Promise<void> {
   try {
+    // Lazy: the webhook utils/processor pull in the executor + blocks stack.
+    // Eager imports would force every `lib/table/service` consumer (e.g. the
+    // dispatcher) to pay that cold-start even when no trigger fires.
+    const { fetchActiveWebhooks } = await import('@/lib/webhooks/polling/utils')
     const webhooks = await fetchActiveWebhooks('table')
     if (webhooks.length === 0) return
 
@@ -74,6 +76,8 @@ export async function fireTableTrigger(
 
     if (matching.length === 0) return
 
+    const { processPolledWebhookEvent } = await import('@/lib/webhooks/processor')
+
     logger.info(
       `[${requestId}] Firing ${matching.length} trigger(s) for ${rows.length} ${eventType} event(s) in table ${tableId}`
     )
diff --git a/apps/sim/lib/table/workflow-columns.ts b/apps/sim/lib/table/workflow-columns.ts
index 686f97dbc6e..b0e7511936a 100644
--- a/apps/sim/lib/table/workflow-columns.ts
+++ b/apps/sim/lib/table/workflow-columns.ts
@@ -203,11 +203,18 @@ export function buildPendingRuns(
 /** Build the per-cell `{payload, options}` items for `queue.batchEnqueue` /
  *  `queue.batchEnqueueAndWait`. Hydrates trigger.dev tags, concurrency keys,
  *  the inline runner, and the cancel key the inline backend uses to map a
- *  Stop click to the in-flight cell's AbortController. */
+ *  Stop click to the in-flight cell's AbortController.
+ *
+ *  `runner` is only used by the database backend; trigger.dev triggers by task
+ *  id. The cell-job import pulls in the executor + blocks stack, so skip it on
+ *  trigger.dev to avoid a multi-second dispatcher cold-start. */
 export async function buildEnqueueItems(
   pendingRuns: WorkflowGroupCellPayload[]
 ): Promise<Array<{ payload: WorkflowGroupCellPayload; options: EnqueueOptions }>> {
-  const { executeWorkflowGroupCellJob } = await import('@/background/workflow-column-execution')
+  const runner = isTriggerDevEnabled
+    ? undefined
+    : ((await import('@/background/workflow-column-execution'))
+        .executeWorkflowGroupCellJob as EnqueueOptions['runner'])
   return pendingRuns.map((runOpts) => ({
     payload: runOpts,
     options: {
@@ -225,7 +232,7 @@ export async function buildEnqueueItems(
       concurrencyKey: runOpts.tableId,
       concurrencyLimit: TABLE_CONCURRENCY_LIMIT,
       tags: cellTagsFor(runOpts),
-      runner: executeWorkflowGroupCellJob as EnqueueOptions['runner'],
+      ...(runner ? { runner } : {}),
       cancelKey: cellCancelKey(runOpts.tableId, runOpts.rowId, runOpts.groupId),
     },
   }))

From c3815509b29983916770b3ec2da77b57e62a05f2 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 12:48:48 -0700
Subject: [PATCH 05/16] fix(landing-nav): scroll to top on route change in
 shared shells (#4676)

* fix(landing-nav): scroll to top on route change in shared shells

* fix(landing-nav): hoist popstate flag to module scope and skip on hash anchors

* fix(landing-nav): use popstate timestamp window so flag self-expires

* fix(landing-nav): use -Infinity sentinel and consume popstate timestamp on use

* fix(landing-nav): skip scroll on initial mount so reload restoration wins

* fix(landing-nav): gate initial-mount skip on document.readyState

* refactor(landing-nav): simplify scroll-to-top to conventional pattern
---
 apps/sim/app/(landing)/blog/layout.tsx        |  2 ++
 .../(landing)/components/scroll-to-top.tsx    | 22 +++++++++++++++++++
 .../(landing)/integrations/(shell)/layout.tsx |  2 ++
 .../app/(landing)/models/(shell)/layout.tsx   |  2 ++
 4 files changed, 28 insertions(+)
 create mode 100644 apps/sim/app/(landing)/components/scroll-to-top.tsx

diff --git a/apps/sim/app/(landing)/blog/layout.tsx b/apps/sim/app/(landing)/blog/layout.tsx
index 96b81a7dca5..a82cb763a4e 100644
--- a/apps/sim/app/(landing)/blog/layout.tsx
+++ b/apps/sim/app/(landing)/blog/layout.tsx
@@ -2,6 +2,7 @@ import { getNavBlogPosts } from '@/lib/blog/registry'
 import { SITE_URL } from '@/lib/core/utils/urls'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Navbar from '@/app/(landing)/components/navbar/navbar'
+import { ScrollToTop } from '@/app/(landing)/components/scroll-to-top'
 
 export default async function StudioLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
@@ -29,6 +30,7 @@ export default async function StudioLayout({ children }: { children: React.React
 
   return (
     <div className='flex min-h-screen flex-col bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)]'>
+      <ScrollToTop />
       <script
         type='application/ld+json'
         dangerouslySetInnerHTML={{ __html: JSON.stringify(orgJsonLd) }}
diff --git a/apps/sim/app/(landing)/components/scroll-to-top.tsx b/apps/sim/app/(landing)/components/scroll-to-top.tsx
new file mode 100644
index 00000000000..781bfa944b0
--- /dev/null
+++ b/apps/sim/app/(landing)/components/scroll-to-top.tsx
@@ -0,0 +1,22 @@
+'use client'
+
+import { useEffect } from 'react'
+import { usePathname } from 'next/navigation'
+
+/**
+ * Resets window scroll to the top on App Router pathname changes.
+ *
+ * Next.js's default scroll handling only brings the new Page element into view,
+ * which often resolves to "no scroll" inside shared layouts (see vercel/next.js#64435).
+ * Skipped when a hash anchor is targeted so the browser's native anchor scroll wins.
+ */
+export function ScrollToTop() {
+  const pathname = usePathname()
+
+  useEffect(() => {
+    if (window.location.hash) return
+    window.scrollTo(0, 0)
+  }, [pathname])
+
+  return null
+}
diff --git a/apps/sim/app/(landing)/integrations/(shell)/layout.tsx b/apps/sim/app/(landing)/integrations/(shell)/layout.tsx
index 231771091c7..c21291ff46a 100644
--- a/apps/sim/app/(landing)/integrations/(shell)/layout.tsx
+++ b/apps/sim/app/(landing)/integrations/(shell)/layout.tsx
@@ -2,6 +2,7 @@ import { getNavBlogPosts } from '@/lib/blog/registry'
 import { SITE_URL } from '@/lib/core/utils/urls'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Navbar from '@/app/(landing)/components/navbar/navbar'
+import { ScrollToTop } from '@/app/(landing)/components/scroll-to-top'
 
 export default async function IntegrationsLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
@@ -29,6 +30,7 @@ export default async function IntegrationsLayout({ children }: { children: React
 
   return (
     <div className='dark flex min-h-screen flex-col bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)]'>
+      <ScrollToTop />
       <script
         type='application/ld+json'
         dangerouslySetInnerHTML={{ __html: JSON.stringify(orgJsonLd) }}
diff --git a/apps/sim/app/(landing)/models/(shell)/layout.tsx b/apps/sim/app/(landing)/models/(shell)/layout.tsx
index 672632f70b4..87a5f42c677 100644
--- a/apps/sim/app/(landing)/models/(shell)/layout.tsx
+++ b/apps/sim/app/(landing)/models/(shell)/layout.tsx
@@ -2,6 +2,7 @@ import { getNavBlogPosts } from '@/lib/blog/registry'
 import { SITE_URL } from '@/lib/core/utils/urls'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Navbar from '@/app/(landing)/components/navbar/navbar'
+import { ScrollToTop } from '@/app/(landing)/components/scroll-to-top'
 
 export default async function ModelsLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
@@ -24,6 +25,7 @@ export default async function ModelsLayout({ children }: { children: React.React
 
   return (
     <div className='dark flex min-h-screen flex-col bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)]'>
+      <ScrollToTop />
       <script
         type='application/ld+json'
         dangerouslySetInnerHTML={{ __html: JSON.stringify(orgJsonLd) }}

From a1b213025608dbbf33f398766136f28c4118e849 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 13:45:42 -0700
Subject: [PATCH 06/16] improvement(knowledge): batch trigger dispatch, prune
 redundant DB roundtrips (#4680)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* improvement(knowledge): batch trigger dispatch, prune redundant DB roundtrips

Connector sync was dispatching Trigger.dev document-processing jobs one
HTTP roundtrip at a time. processDocumentsWithQueue now uses
tasks.batchTrigger when Trigger.dev is available, collapsing N roundtrips
to ceil(N/1000). Idempotency keys protect against duplicate runs on retry.

Also trims DB roundtrips inside the sync loop:
- Per-batch isConnectorDeleted + isKnowledgeBaseDeleted collapsed into a
  single checkSyncLiveness JOIN (one SELECT instead of two per batch).
- Dropped redundant pre-upload isKnowledgeBaseDeleted checks from
  addDocument/updateDocument: the batch-boundary liveness check already
  catches pre-batch deletions and the in-tx FOR UPDATE is authoritative
  for races during the batch.
- Removed dead processDocumentsWithTrigger helper (never called).

* refactor(knowledge): split dispatch helpers, drop dead trigger branch

- Use the canonical DocumentProcessingPayload from the task module instead
  of the duplicate DocumentJobData interface in service.ts
- Pass typeof processDocumentTask as a generic to tasks.batchTrigger so the
  payload shape is type-checked against the task definition
- Inline TRIGGER_BATCH_SIZE provenance (Trigger.dev SDK 4.3.1+ doc'd cap,
  we're on 4.4.3)
- Split direct vs trigger dispatch into dispatchInProcess and
  dispatchViaBatchTrigger; collapse the all-failed throw into a single
  check on the combined dispatched counter
- Remove dispatchDocumentProcessingJob — its trigger branch is no longer
  reachable now that batchTrigger handles the trigger path, and the direct
  branch is inlined

* improvement(knowledge): log Trigger.dev batchIds for audit trail

tasks.batchTrigger returns a batchId per call. Collecting and logging
them after dispatch makes it possible to look up or cancel batches in
the Trigger.dev dashboard when investigating stuck or missing documents.

* improvement(knowledge): thread requestId through direct dispatch logs

Symmetry polish: dispatchInProcess now includes [requestId] in its error
log so direct-mode failures are correlatable the same way trigger-mode
failures already are.

* improvement(knowledge): trim verbose comments

Tightens TSDoc on processDocumentsWithQueue, TRIGGER_BATCH_SIZE,
checkSyncLiveness, and the idempotency-key inline comment.
---
 .../lib/knowledge/connectors/sync-engine.ts   |  50 ++---
 apps/sim/lib/knowledge/documents/service.ts   | 193 +++++++++---------
 2 files changed, 120 insertions(+), 123 deletions(-)

diff --git a/apps/sim/lib/knowledge/connectors/sync-engine.ts b/apps/sim/lib/knowledge/connectors/sync-engine.ts
index 7da40aebd18..848bc3de77c 100644
--- a/apps/sim/lib/knowledge/connectors/sync-engine.ts
+++ b/apps/sim/lib/knowledge/connectors/sync-engine.ts
@@ -58,22 +58,30 @@ type DocOp =
   | { type: 'add'; extDoc: ExternalDocument }
   | { type: 'update'; existingId: string; extDoc: ExternalDocument }
 
-async function isConnectorDeleted(connectorId: string): Promise<boolean> {
+/** Single-roundtrip liveness check used between batches. */
+async function checkSyncLiveness(
+  connectorId: string,
+  knowledgeBaseId: string
+): Promise<{ connectorDeleted: boolean; knowledgeBaseDeleted: boolean }> {
   const rows = await db
-    .select({ archivedAt: knowledgeConnector.archivedAt, deletedAt: knowledgeConnector.deletedAt })
+    .select({
+      connectorArchivedAt: knowledgeConnector.archivedAt,
+      connectorDeletedAt: knowledgeConnector.deletedAt,
+      kbDeletedAt: knowledgeBase.deletedAt,
+    })
     .from(knowledgeConnector)
-    .where(eq(knowledgeConnector.id, connectorId))
+    .innerJoin(knowledgeBase, eq(knowledgeBase.id, knowledgeConnector.knowledgeBaseId))
+    .where(and(eq(knowledgeConnector.id, connectorId), eq(knowledgeBase.id, knowledgeBaseId)))
     .limit(1)
-  return rows.length === 0 || rows[0].archivedAt !== null || rows[0].deletedAt !== null
-}
 
-async function isKnowledgeBaseDeleted(knowledgeBaseId: string): Promise<boolean> {
-  const rows = await db
-    .select({ deletedAt: knowledgeBase.deletedAt })
-    .from(knowledgeBase)
-    .where(eq(knowledgeBase.id, knowledgeBaseId))
-    .limit(1)
-  return rows.length === 0 || rows[0].deletedAt !== null
+  if (rows.length === 0) {
+    return { connectorDeleted: true, knowledgeBaseDeleted: true }
+  }
+  const row = rows[0]
+  return {
+    connectorDeleted: row.connectorArchivedAt !== null || row.connectorDeletedAt !== null,
+    knowledgeBaseDeleted: row.kbDeletedAt !== null,
+  }
 }
 
 async function isKnowledgeBaseActiveInTx(
@@ -502,10 +510,11 @@ export async function executeSync(
     }
 
     for (let i = 0; i < pendingOps.length; i += SYNC_BATCH_SIZE) {
-      if (await isConnectorDeleted(connectorId)) {
+      const liveness = await checkSyncLiveness(connectorId, connector.knowledgeBaseId)
+      if (liveness.connectorDeleted) {
         throw new ConnectorDeletedException(connectorId)
       }
-      if (await isKnowledgeBaseDeleted(connector.knowledgeBaseId)) {
+      if (liveness.knowledgeBaseDeleted) {
         throw new Error(`Knowledge base ${connector.knowledgeBaseId} was deleted during sync`)
       }
 
@@ -642,11 +651,12 @@ export async function executeSync(
       }
     }
 
-    // Check if connector was deleted before retrying stuck documents
-    if (await isConnectorDeleted(connectorId)) {
+    // Check if connector/KB were deleted before retrying stuck documents
+    const postBatchLiveness = await checkSyncLiveness(connectorId, connector.knowledgeBaseId)
+    if (postBatchLiveness.connectorDeleted) {
       throw new ConnectorDeletedException(connectorId)
     }
-    if (await isKnowledgeBaseDeleted(connector.knowledgeBaseId)) {
+    if (postBatchLiveness.knowledgeBaseDeleted) {
       throw new Error(`Knowledge base ${connector.knowledgeBaseId} was deleted during sync`)
     }
 
@@ -881,9 +891,6 @@ async function addDocument(
   extDoc: ExternalDocument,
   sourceConfig?: Record<string, unknown>
 ): Promise<DocumentData> {
-  if (await isKnowledgeBaseDeleted(knowledgeBaseId)) {
-    throw new Error(`Knowledge base ${knowledgeBaseId} is deleted`)
-  }
   const documentId = generateId()
   const contentBuffer = Buffer.from(extDoc.content, 'utf-8')
   const safeTitle = sanitizeStorageTitle(extDoc.title)
@@ -963,9 +970,6 @@ async function updateDocument(
   extDoc: ExternalDocument,
   sourceConfig?: Record<string, unknown>
 ): Promise<DocumentData> {
-  if (await isKnowledgeBaseDeleted(knowledgeBaseId)) {
-    throw new Error(`Knowledge base ${knowledgeBaseId} is deleted`)
-  }
   // Fetch old file URL before uploading replacement
   const existingRows = await db
     .select({ fileUrl: document.fileUrl })
diff --git a/apps/sim/lib/knowledge/documents/service.ts b/apps/sim/lib/knowledge/documents/service.ts
index 204b5179113..be71c279717 100644
--- a/apps/sim/lib/knowledge/documents/service.ts
+++ b/apps/sim/lib/knowledge/documents/service.ts
@@ -48,7 +48,10 @@ import { estimateTokenCount } from '@/lib/tokenization/estimators'
 import { deleteFile } from '@/lib/uploads/core/storage-service'
 import { extractStorageKey } from '@/lib/uploads/utils/file-utils'
 import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
-import type { DocumentProcessingPayload } from '@/background/knowledge-processing'
+import type {
+  DocumentProcessingPayload,
+  processDocument as processDocumentTask,
+} from '@/background/knowledge-processing'
 import { calculateCost } from '@/providers/utils'
 
 const logger = createLogger('DocumentService')
@@ -102,35 +105,6 @@ export interface ProcessingOptions {
   lang?: string
 }
 
-interface DocumentJobData {
-  knowledgeBaseId: string
-  documentId: string
-  docData: {
-    filename: string
-    fileUrl: string
-    fileSize: number
-    mimeType: string
-  }
-  processingOptions: ProcessingOptions
-  requestId: string
-}
-
-async function dispatchDocumentProcessingJob(payload: DocumentJobData): Promise<void> {
-  if (isTriggerAvailable()) {
-    await tasks.trigger('knowledge-process-document', payload, {
-      tags: [`knowledgeBaseId:${payload.knowledgeBaseId}`, `documentId:${payload.documentId}`],
-    })
-    return
-  }
-
-  await processDocumentAsync(
-    payload.knowledgeBaseId,
-    payload.documentId,
-    payload.docData,
-    payload.processingOptions
-  )
-}
-
 interface DocumentTagData {
   tagName: string
   fieldType: string
@@ -314,13 +288,16 @@ async function processDocumentTags(
   return result
 }
 
-export async function processDocumentsWithQueue(
-  createdDocuments: DocumentData[],
+/** Per-call cap for `tasks.batchTrigger` on Trigger.dev SDK 4.3.1+. */
+const TRIGGER_BATCH_SIZE = 1000
+
+function buildJobPayload(
+  doc: DocumentData,
   knowledgeBaseId: string,
   processingOptions: ProcessingOptions,
   requestId: string
-): Promise<void> {
-  const jobPayloads = createdDocuments.map<DocumentJobData>((doc) => ({
+): DocumentProcessingPayload {
+  return {
     knowledgeBaseId,
     documentId: doc.documentId,
     docData: {
@@ -331,35 +308,99 @@ export async function processDocumentsWithQueue(
     },
     processingOptions,
     requestId,
-  }))
+  }
+}
 
-  logger.info(
-    `[${requestId}] Dispatching background processing for ${jobPayloads.length} documents`,
-    {
-      backend: isTriggerAvailable() ? 'trigger-dev' : 'direct',
-    }
+/**
+ * Dispatches document processing jobs via Trigger.dev's `batchTrigger` when
+ * available, or in-process otherwise. Throws only when every dispatch fails;
+ * partial failures are logged and recovered by the next sync's stuck-doc pass.
+ */
+export async function processDocumentsWithQueue(
+  createdDocuments: DocumentData[],
+  knowledgeBaseId: string,
+  processingOptions: ProcessingOptions,
+  requestId: string
+): Promise<void> {
+  if (createdDocuments.length === 0) return
+
+  const jobPayloads = createdDocuments.map((doc) =>
+    buildJobPayload(doc, knowledgeBaseId, processingOptions, requestId)
   )
 
-  const results = await Promise.allSettled(
-    jobPayloads.map((payload) => dispatchDocumentProcessingJob(payload))
+  const useTrigger = isTriggerAvailable()
+  logger.info(
+    `[${requestId}] Dispatching background processing for ${jobPayloads.length} documents`,
+    { backend: useTrigger ? 'trigger-dev' : 'direct' }
   )
 
-  const failures = results.filter((r): r is PromiseRejectedResult => r.status === 'rejected')
-  if (failures.length > 0) {
-    logger.error(`[${requestId}] ${failures.length}/${results.length} document dispatches failed`, {
-      errors: failures.map((f) => getErrorMessage(f.reason)),
-    })
-  }
+  const dispatched = useTrigger
+    ? await dispatchViaBatchTrigger(jobPayloads, requestId)
+    : await dispatchInProcess(jobPayloads, requestId)
 
   logger.info(
-    `[${requestId}] Document dispatch complete: ${results.length - failures.length}/${results.length} succeeded`
+    `[${requestId}] Document dispatch complete: ${dispatched}/${jobPayloads.length} succeeded`
   )
 
-  if (failures.length === results.length) {
-    throw new Error(`All ${failures.length} document processing dispatches failed`)
+  if (dispatched === 0) {
+    throw new Error(`All ${jobPayloads.length} document processing dispatches failed`)
+  }
+}
+
+async function dispatchViaBatchTrigger(
+  jobPayloads: DocumentProcessingPayload[],
+  requestId: string
+): Promise<number> {
+  let dispatched = 0
+  const batchIds: string[] = []
+  for (let i = 0; i < jobPayloads.length; i += TRIGGER_BATCH_SIZE) {
+    const chunk = jobPayloads.slice(i, i + TRIGGER_BATCH_SIZE)
+    try {
+      const result = await tasks.batchTrigger<typeof processDocumentTask>(
+        'knowledge-process-document',
+        chunk.map((payload) => ({
+          payload,
+          options: {
+            // Scoped to (documentId, requestId): blocks intra-dispatch retries
+            // from double-enqueuing; later syncs use a fresh requestId.
+            idempotencyKey: `doc-process-${payload.documentId}-${requestId}`,
+            tags: [
+              `knowledgeBaseId:${payload.knowledgeBaseId}`,
+              `documentId:${payload.documentId}`,
+            ],
+          },
+        }))
+      )
+      batchIds.push(result.batchId)
+      dispatched += chunk.length
+    } catch (error) {
+      logger.error(`[${requestId}] Failed to batchTrigger ${chunk.length} document jobs`, {
+        error: getErrorMessage(error),
+      })
+    }
+  }
+  if (batchIds.length > 0) {
+    logger.info(`[${requestId}] Trigger.dev batches dispatched`, { batchIds })
   }
+  return dispatched
+}
 
-  return
+async function dispatchInProcess(
+  jobPayloads: DocumentProcessingPayload[],
+  requestId: string
+): Promise<number> {
+  const results = await Promise.allSettled(
+    jobPayloads.map((p) =>
+      processDocumentAsync(p.knowledgeBaseId, p.documentId, p.docData, p.processingOptions)
+    )
+  )
+  let dispatched = 0
+  for (const r of results) {
+    if (r.status === 'fulfilled') dispatched++
+    else
+      logger.error(`[${requestId}] Document dispatch failed`, { error: getErrorMessage(r.reason) })
+  }
+  return dispatched
 }
 
 export async function processDocumentAsync(
@@ -698,54 +739,6 @@ export function isTriggerAvailable(): boolean {
   return Boolean(env.TRIGGER_SECRET_KEY) && isTriggerDevEnabled
 }
 
-async function processDocumentsWithTrigger(
-  documents: DocumentProcessingPayload[],
-  requestId: string
-): Promise<{ success: boolean; message: string; batchIds?: string[] }> {
-  if (!isTriggerAvailable()) {
-    throw new Error('Trigger.dev is not configured - TRIGGER_SECRET_KEY missing')
-  }
-
-  try {
-    logger.info(`[${requestId}] Triggering background processing for ${documents.length} documents`)
-
-    const MAX_BATCH_SIZE = 1000
-    const batchIds: string[] = []
-
-    for (let i = 0; i < documents.length; i += MAX_BATCH_SIZE) {
-      const chunk = documents.slice(i, i + MAX_BATCH_SIZE)
-      const batchResult = await tasks.batchTrigger(
-        'knowledge-process-document',
-        chunk.map((doc) => ({
-          payload: doc,
-          options: {
-            idempotencyKey: `doc-process-${doc.documentId}-${requestId}`,
-            tags: [`knowledgeBaseId:${doc.knowledgeBaseId}`, `documentId:${doc.documentId}`],
-          },
-        }))
-      )
-      batchIds.push(batchResult.batchId)
-    }
-
-    logger.info(
-      `[${requestId}] Triggered ${documents.length} document processing jobs in ${batchIds.length} batch(es)`
-    )
-
-    return {
-      success: true,
-      message: `${documents.length} document processing jobs triggered`,
-      batchIds,
-    }
-  } catch (error) {
-    logger.error(`[${requestId}] Failed to trigger document processing jobs:`, error)
-
-    return {
-      success: false,
-      message: getErrorMessage(error, 'Failed to trigger background jobs'),
-    }
-  }
-}
-
 export async function createDocumentRecords(
   documents: Array<{
     filename: string

From 7e678552d6aeb9a305ffbd8a48e38a7ba13a2c4b Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 13:46:29 -0700
Subject: [PATCH 07/16] improvement(elevenlabs): wire stability and
 similarity_boost end-to-end (#4679)

* improvement(elevenlabs): wire stability and similarity_boost end-to-end

* fix(elevenlabs): guard NaN in voice settings and always send both knobs together
---
 apps/sim/app/api/tools/tts/route.ts           | 22 +++++++++-
 apps/sim/blocks/blocks/elevenlabs.ts          | 40 +++++++++++++++----
 apps/sim/lib/api/contracts/tools/media/tts.ts |  2 +
 apps/sim/tools/elevenlabs/tts.ts              |  8 ++--
 apps/sim/tools/elevenlabs/types.ts            |  9 +----
 5 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/apps/sim/app/api/tools/tts/route.ts b/apps/sim/app/api/tools/tts/route.ts
index 7a82e57eebf..929e995c1da 100644
--- a/apps/sim/app/api/tools/tts/route.ts
+++ b/apps/sim/app/api/tools/tts/route.ts
@@ -35,8 +35,17 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
     )
     if (!parsed.success) return parsed.response
 
-    const { text, voiceId, apiKey, modelId, workspaceId, workflowId, executionId } =
-      parsed.data.body
+    const {
+      text,
+      voiceId,
+      apiKey,
+      modelId,
+      stability,
+      similarityBoost,
+      workspaceId,
+      workflowId,
+      executionId,
+    } = parsed.data.body
 
     const voiceIdValidation = validateAlphanumericId(voiceId, 'voiceId', 255)
     if (!voiceIdValidation.isValid) {
@@ -57,6 +66,14 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
 
     const endpoint = `https://api.elevenlabs.io/v1/text-to-speech/${voiceId}`
 
+    const hasVoiceSetting = stability !== undefined || similarityBoost !== undefined
+    const voiceSettings = hasVoiceSetting
+      ? {
+          stability: stability ?? 0.5,
+          similarity_boost: similarityBoost ?? 0.75,
+        }
+      : undefined
+
     const response = await fetch(endpoint, {
       method: 'POST',
       headers: {
@@ -67,6 +84,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       body: JSON.stringify({
         text,
         model_id: modelId,
+        ...(voiceSettings ? { voice_settings: voiceSettings } : {}),
       }),
       signal: AbortSignal.timeout(DEFAULT_EXECUTION_TIMEOUT_MS),
     })
diff --git a/apps/sim/blocks/blocks/elevenlabs.ts b/apps/sim/blocks/blocks/elevenlabs.ts
index b514fa556f8..079ea4ee50e 100644
--- a/apps/sim/blocks/blocks/elevenlabs.ts
+++ b/apps/sim/blocks/blocks/elevenlabs.ts
@@ -5,7 +5,7 @@ import type { ElevenLabsBlockResponse } from '@/tools/elevenlabs/types'
 export const ElevenLabsBlock: BlockConfig<ElevenLabsBlockResponse> = {
   type: 'elevenlabs',
   name: 'ElevenLabs',
-  description: 'Convert TTS using ElevenLabs',
+  description: 'Convert text to speech with ElevenLabs',
   authMode: AuthMode.ApiKey,
   longDescription: 'Integrate ElevenLabs into the workflow. Can convert text to speech.',
   docsLink: 'https://docs.sim.ai/tools/elevenlabs',
@@ -42,6 +42,21 @@ export const ElevenLabsBlock: BlockConfig<ElevenLabsBlockResponse> = {
         { label: 'eleven_flash_v2_5', id: 'eleven_flash_v2_5' },
         { label: 'eleven_v3', id: 'eleven_v3' },
       ],
+      value: () => 'eleven_monolingual_v1',
+    },
+    {
+      id: 'stability',
+      title: 'Stability',
+      type: 'short-input',
+      placeholder: '0.0 to 1.0 (e.g., 0.5)',
+      mode: 'advanced',
+    },
+    {
+      id: 'similarityBoost',
+      title: 'Similarity Boost',
+      type: 'short-input',
+      placeholder: '0.0 to 1.0 (e.g., 0.75)',
+      mode: 'advanced',
     },
     {
       id: 'apiKey',
@@ -57,12 +72,21 @@ export const ElevenLabsBlock: BlockConfig<ElevenLabsBlockResponse> = {
     access: ['elevenlabs_tts'],
     config: {
       tool: () => 'elevenlabs_tts',
-      params: (params) => ({
-        apiKey: params.apiKey,
-        text: params.text,
-        voiceId: params.voiceId,
-        modelId: params.modelId,
-      }),
+      params: (params) => {
+        const parseUnitInterval = (value: unknown): number | undefined => {
+          if (value === undefined || value === null || value === '') return undefined
+          const n = Number(value)
+          return Number.isFinite(n) ? n : undefined
+        }
+        return {
+          apiKey: params.apiKey,
+          text: params.text,
+          voiceId: params.voiceId,
+          modelId: params.modelId,
+          stability: parseUnitInterval(params.stability),
+          similarityBoost: parseUnitInterval(params.similarityBoost),
+        }
+      },
     },
   },
 
@@ -70,6 +94,8 @@ export const ElevenLabsBlock: BlockConfig<ElevenLabsBlockResponse> = {
     text: { type: 'string', description: 'Text to convert' },
     voiceId: { type: 'string', description: 'Voice identifier' },
     modelId: { type: 'string', description: 'Model identifier' },
+    stability: { type: 'number', description: 'Voice stability 0.0-1.0' },
+    similarityBoost: { type: 'number', description: 'Similarity boost 0.0-1.0' },
     apiKey: { type: 'string', description: 'ElevenLabs API key' },
   },
 
diff --git a/apps/sim/lib/api/contracts/tools/media/tts.ts b/apps/sim/lib/api/contracts/tools/media/tts.ts
index 3a5b68e50a8..fdff389ccde 100644
--- a/apps/sim/lib/api/contracts/tools/media/tts.ts
+++ b/apps/sim/lib/api/contracts/tools/media/tts.ts
@@ -7,6 +7,8 @@ export const ttsToolBodySchema = z.object({
   voiceId: z.string({ error: 'Missing required parameters' }).min(1, 'Missing required parameters'),
   apiKey: z.string({ error: 'Missing required parameters' }).min(1, 'Missing required parameters'),
   modelId: z.string().optional().default('eleven_monolingual_v1'),
+  stability: z.coerce.number().min(0).max(1).optional(),
+  similarityBoost: z.coerce.number().min(0).max(1).optional(),
   workspaceId: z.string().optional(),
   workflowId: z.string().optional(),
   executionId: z.string().optional(),
diff --git a/apps/sim/tools/elevenlabs/tts.ts b/apps/sim/tools/elevenlabs/tts.ts
index e0a42e010ca..2faee98a5e6 100644
--- a/apps/sim/tools/elevenlabs/tts.ts
+++ b/apps/sim/tools/elevenlabs/tts.ts
@@ -4,7 +4,7 @@ import type { ToolConfig } from '@/tools/types'
 export const elevenLabsTtsTool: ToolConfig<ElevenLabsTtsParams, ElevenLabsTtsResponse> = {
   id: 'elevenlabs_tts',
   name: 'ElevenLabs TTS',
-  description: 'Convert TTS using ElevenLabs voices',
+  description: 'Convert text to speech using ElevenLabs voices',
   version: '1.0.0',
 
   params: {
@@ -34,7 +34,7 @@ export const elevenLabsTtsTool: ToolConfig<ElevenLabsTtsParams, ElevenLabsTtsRes
       description:
         'Voice stability setting from 0.0 to 1.0 (e.g., 0.5 for balanced, 0.75 for more stable). Higher values produce more consistent output',
     },
-    similarity: {
+    similarityBoost: {
       type: 'number',
       required: false,
       visibility: 'user-or-llm',
@@ -52,7 +52,7 @@ export const elevenLabsTtsTool: ToolConfig<ElevenLabsTtsParams, ElevenLabsTtsRes
   request: {
     url: '/api/tools/tts',
     method: 'POST',
-    headers: (params) => ({
+    headers: () => ({
       'Content-Type': 'application/json',
     }),
     body: (
@@ -65,7 +65,7 @@ export const elevenLabsTtsTool: ToolConfig<ElevenLabsTtsParams, ElevenLabsTtsRes
       voiceId: params.voiceId,
       modelId: params.modelId || 'eleven_monolingual_v1',
       stability: params.stability,
-      similarity: params.similarity,
+      similarityBoost: params.similarityBoost,
       workspaceId: params._context?.workspaceId,
       workflowId: params._context?.workflowId,
       executionId: params._context?.executionId,
diff --git a/apps/sim/tools/elevenlabs/types.ts b/apps/sim/tools/elevenlabs/types.ts
index 5627d1f72ce..7c00d48942f 100644
--- a/apps/sim/tools/elevenlabs/types.ts
+++ b/apps/sim/tools/elevenlabs/types.ts
@@ -7,7 +7,7 @@ export interface ElevenLabsTtsParams {
   voiceId: string
   modelId?: string
   stability?: number
-  similarity?: number
+  similarityBoost?: number
 }
 
 export interface ElevenLabsTtsResponse extends ToolResponse {
@@ -17,9 +17,4 @@ export interface ElevenLabsTtsResponse extends ToolResponse {
   }
 }
 
-export interface ElevenLabsBlockResponse extends ToolResponse {
-  output: {
-    audioUrl: string
-    audioFile?: UserFile
-  }
-}
+export type ElevenLabsBlockResponse = ElevenLabsTtsResponse

From b6679a98809f792a85efa1a6799fcb2056cd63fc Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 13:46:40 -0700
Subject: [PATCH 08/16] feat(google-slides): complete API surface for branded
 slide generation (#4678)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(google-slides): complete API surface for branded slide generation

* fix(google-slides): address PR review — explicit videoId mapping, fast base64 export, remove dead utility

* fix(google-slides): declare z-order operation output in block outputs map
---
 apps/sim/blocks/blocks/google_slides.ts       | 2505 ++++++++++++++++-
 apps/sim/tools/google_slides/batch_update.ts  |  139 +
 .../tools/google_slides/copy_presentation.ts  |  128 +
 apps/sim/tools/google_slides/create_line.ts   |  157 ++
 .../google_slides/create_paragraph_bullets.ts |  160 ++
 .../google_slides/create_sheets_chart.ts      |  175 ++
 apps/sim/tools/google_slides/create_video.ts  |  165 ++
 .../google_slides/delete_paragraph_bullets.ts |  150 +
 .../google_slides/delete_table_column.ts      |  116 +
 .../tools/google_slides/delete_table_row.ts   |  115 +
 apps/sim/tools/google_slides/delete_text.ts   |  148 +
 .../google_slides/export_presentation.ts      |  131 +
 apps/sim/tools/google_slides/group_objects.ts |  131 +
 apps/sim/tools/google_slides/index.ts         |   85 +
 .../google_slides/insert_table_columns.ts     |  139 +
 .../tools/google_slides/insert_table_rows.ts  |  136 +
 .../tools/google_slides/merge_table_cells.ts  |  137 +
 .../google_slides/refresh_sheets_chart.ts     |   95 +
 .../replace_all_shapes_with_image.ts          |  151 +
 .../replace_all_shapes_with_sheets_chart.ts   |  164 ++
 apps/sim/tools/google_slides/replace_image.ts |  125 +
 apps/sim/tools/google_slides/reroute_line.ts  |   92 +
 .../tools/google_slides/ungroup_objects.ts    |  103 +
 .../google_slides/unmerge_table_cells.ts      |  137 +
 .../google_slides/update_image_properties.ts  |  267 ++
 .../google_slides/update_line_category.ts     |  115 +
 .../google_slides/update_line_properties.ts   |  201 ++
 .../update_page_element_alt_text.ts           |  114 +
 .../update_page_element_transform.ts          |  171 ++
 .../update_page_elements_z_order.ts           |  122 +
 .../google_slides/update_page_properties.ts   |  185 ++
 .../google_slides/update_paragraph_style.ts   |  288 ++
 .../google_slides/update_shape_properties.ts  |  246 ++
 .../google_slides/update_slide_properties.ts  |  140 +
 .../update_table_border_properties.ts         |  227 ++
 .../update_table_cell_properties.ts           |  210 ++
 .../update_table_column_properties.ts         |  158 ++
 .../update_table_row_properties.ts            |  158 ++
 .../tools/google_slides/update_text_style.ts  |  311 ++
 .../google_slides/update_video_properties.ts  |  208 ++
 apps/sim/tools/google_slides/utils.ts         |  136 +
 apps/sim/tools/registry.ts                    |   77 +
 42 files changed, 8917 insertions(+), 1 deletion(-)
 create mode 100644 apps/sim/tools/google_slides/batch_update.ts
 create mode 100644 apps/sim/tools/google_slides/copy_presentation.ts
 create mode 100644 apps/sim/tools/google_slides/create_line.ts
 create mode 100644 apps/sim/tools/google_slides/create_paragraph_bullets.ts
 create mode 100644 apps/sim/tools/google_slides/create_sheets_chart.ts
 create mode 100644 apps/sim/tools/google_slides/create_video.ts
 create mode 100644 apps/sim/tools/google_slides/delete_paragraph_bullets.ts
 create mode 100644 apps/sim/tools/google_slides/delete_table_column.ts
 create mode 100644 apps/sim/tools/google_slides/delete_table_row.ts
 create mode 100644 apps/sim/tools/google_slides/delete_text.ts
 create mode 100644 apps/sim/tools/google_slides/export_presentation.ts
 create mode 100644 apps/sim/tools/google_slides/group_objects.ts
 create mode 100644 apps/sim/tools/google_slides/insert_table_columns.ts
 create mode 100644 apps/sim/tools/google_slides/insert_table_rows.ts
 create mode 100644 apps/sim/tools/google_slides/merge_table_cells.ts
 create mode 100644 apps/sim/tools/google_slides/refresh_sheets_chart.ts
 create mode 100644 apps/sim/tools/google_slides/replace_all_shapes_with_image.ts
 create mode 100644 apps/sim/tools/google_slides/replace_all_shapes_with_sheets_chart.ts
 create mode 100644 apps/sim/tools/google_slides/replace_image.ts
 create mode 100644 apps/sim/tools/google_slides/reroute_line.ts
 create mode 100644 apps/sim/tools/google_slides/ungroup_objects.ts
 create mode 100644 apps/sim/tools/google_slides/unmerge_table_cells.ts
 create mode 100644 apps/sim/tools/google_slides/update_image_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_line_category.ts
 create mode 100644 apps/sim/tools/google_slides/update_line_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_page_element_alt_text.ts
 create mode 100644 apps/sim/tools/google_slides/update_page_element_transform.ts
 create mode 100644 apps/sim/tools/google_slides/update_page_elements_z_order.ts
 create mode 100644 apps/sim/tools/google_slides/update_page_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_paragraph_style.ts
 create mode 100644 apps/sim/tools/google_slides/update_shape_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_slide_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_table_border_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_table_cell_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_table_column_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_table_row_properties.ts
 create mode 100644 apps/sim/tools/google_slides/update_text_style.ts
 create mode 100644 apps/sim/tools/google_slides/update_video_properties.ts
 create mode 100644 apps/sim/tools/google_slides/utils.ts

diff --git a/apps/sim/blocks/blocks/google_slides.ts b/apps/sim/blocks/blocks/google_slides.ts
index 09260f1b394..2608eb71f13 100644
--- a/apps/sim/blocks/blocks/google_slides.ts
+++ b/apps/sim/blocks/blocks/google_slides.ts
@@ -13,7 +13,7 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
   hideFromToolbar: true,
   authMode: AuthMode.OAuth,
   longDescription:
-    'Integrate Google Slides into the workflow. Can read, write, create presentations, replace text, add slides, add images, get thumbnails, get page details, delete objects, duplicate objects, reorder slides, create tables, create shapes, and insert text.',
+    'Build, edit, and export branded Google Slides presentations end-to-end. Copy a template, replace text and image tokens, embed Sheets charts, style text and shapes with brand fonts and colors, manage tables and layouts, group elements, run atomic batch updates, and export to PDF or PPTX.',
   docsLink: 'https://docs.sim.ai/tools/google_slides',
   category: 'tools',
   integrationType: IntegrationType.Documents,
@@ -30,7 +30,13 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
         { label: 'Read Presentation', id: 'read' },
         { label: 'Write to Presentation', id: 'write' },
         { label: 'Create Presentation', id: 'create' },
+        { label: 'Copy Presentation', id: 'copy_presentation' },
+        { label: 'Export Presentation', id: 'export_presentation' },
+        { label: 'Batch Update (Raw)', id: 'batch_update' },
         { label: 'Replace All Text', id: 'replace_all_text' },
+        { label: 'Replace All Shapes With Image', id: 'replace_all_shapes_with_image' },
+        { label: 'Replace Image', id: 'replace_image' },
+        { label: 'Update Image Properties', id: 'update_image_properties' },
         { label: 'Add Slide', id: 'add_slide' },
         { label: 'Add Image', id: 'add_image' },
         { label: 'Get Thumbnail', id: 'get_thumbnail' },
@@ -40,7 +46,42 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
         { label: 'Reorder Slides', id: 'reorder_slides' },
         { label: 'Create Table', id: 'create_table' },
         { label: 'Create Shape', id: 'create_shape' },
+        { label: 'Create Line', id: 'create_line' },
         { label: 'Insert Text', id: 'insert_text' },
+        { label: 'Delete Text', id: 'delete_text' },
+        { label: 'Update Text Style', id: 'update_text_style' },
+        { label: 'Update Paragraph Style', id: 'update_paragraph_style' },
+        { label: 'Create Paragraph Bullets', id: 'create_paragraph_bullets' },
+        { label: 'Delete Paragraph Bullets', id: 'delete_paragraph_bullets' },
+        { label: 'Update Shape Properties', id: 'update_shape_properties' },
+        { label: 'Update Page Properties', id: 'update_page_properties' },
+        { label: 'Update Slide Properties', id: 'update_slide_properties' },
+        { label: 'Update Alt Text', id: 'update_page_element_alt_text' },
+        { label: 'Update Element Transform', id: 'update_page_element_transform' },
+        { label: 'Update Z-Order', id: 'update_page_elements_z_order' },
+        { label: 'Group Objects', id: 'group_objects' },
+        { label: 'Ungroup Objects', id: 'ungroup_objects' },
+        { label: 'Update Line Properties', id: 'update_line_properties' },
+        { label: 'Update Line Category', id: 'update_line_category' },
+        { label: 'Reroute Line', id: 'reroute_line' },
+        { label: 'Insert Table Rows', id: 'insert_table_rows' },
+        { label: 'Insert Table Columns', id: 'insert_table_columns' },
+        { label: 'Delete Table Row', id: 'delete_table_row' },
+        { label: 'Delete Table Column', id: 'delete_table_column' },
+        { label: 'Merge Table Cells', id: 'merge_table_cells' },
+        { label: 'Unmerge Table Cells', id: 'unmerge_table_cells' },
+        { label: 'Update Table Cell Properties', id: 'update_table_cell_properties' },
+        { label: 'Update Table Border Properties', id: 'update_table_border_properties' },
+        { label: 'Update Table Column Properties', id: 'update_table_column_properties' },
+        { label: 'Update Table Row Properties', id: 'update_table_row_properties' },
+        { label: 'Embed Sheets Chart', id: 'create_sheets_chart' },
+        { label: 'Refresh Sheets Chart', id: 'refresh_sheets_chart' },
+        {
+          label: 'Replace All Shapes With Sheets Chart',
+          id: 'replace_all_shapes_with_sheets_chart',
+        },
+        { label: 'Embed Video', id: 'create_video' },
+        { label: 'Update Video Properties', id: 'update_video_properties' },
       ],
       value: () => 'read',
     },
@@ -95,6 +136,43 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
           'create_table',
           'create_shape',
           'insert_text',
+          'batch_update',
+          'export_presentation',
+          'replace_all_shapes_with_image',
+          'replace_image',
+          'update_image_properties',
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+          'update_shape_properties',
+          'update_page_properties',
+          'update_slide_properties',
+          'update_page_element_alt_text',
+          'update_page_element_transform',
+          'update_page_elements_z_order',
+          'group_objects',
+          'ungroup_objects',
+          'create_line',
+          'update_line_properties',
+          'update_line_category',
+          'reroute_line',
+          'insert_table_rows',
+          'insert_table_columns',
+          'delete_table_row',
+          'delete_table_column',
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+          'update_table_column_properties',
+          'update_table_row_properties',
+          'create_sheets_chart',
+          'refresh_sheets_chart',
+          'replace_all_shapes_with_sheets_chart',
+          'create_video',
+          'update_video_properties',
         ],
       },
     },
@@ -123,6 +201,43 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
           'create_table',
           'create_shape',
           'insert_text',
+          'batch_update',
+          'export_presentation',
+          'replace_all_shapes_with_image',
+          'replace_image',
+          'update_image_properties',
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+          'update_shape_properties',
+          'update_page_properties',
+          'update_slide_properties',
+          'update_page_element_alt_text',
+          'update_page_element_transform',
+          'update_page_elements_z_order',
+          'group_objects',
+          'ungroup_objects',
+          'create_line',
+          'update_line_properties',
+          'update_line_category',
+          'reroute_line',
+          'insert_table_rows',
+          'insert_table_columns',
+          'delete_table_row',
+          'delete_table_column',
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+          'update_table_column_properties',
+          'update_table_row_properties',
+          'create_sheets_chart',
+          'refresh_sheets_chart',
+          'replace_all_shapes_with_sheets_chart',
+          'create_video',
+          'update_video_properties',
         ],
       },
     },
@@ -621,6 +736,1610 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
       placeholder: 'Zero-based index (default: 0)',
       condition: { field: 'operation', value: 'insert_text' },
     },
+
+    // ========== Copy Presentation Operation Fields ==========
+    {
+      id: 'sourcePresentationSelector',
+      title: 'Source Presentation',
+      type: 'file-selector',
+      canonicalParamId: 'sourcePresentationId',
+      serviceId: 'google-drive',
+      selectorKey: 'google.drive',
+      requiredScopes: [],
+      mimeType: 'application/vnd.google-apps.presentation',
+      placeholder: 'Select template presentation to copy',
+      dependsOn: ['credential'],
+      mode: 'basic',
+      condition: { field: 'operation', value: 'copy_presentation' },
+      required: true,
+    },
+    {
+      id: 'manualSourcePresentationId',
+      title: 'Source Presentation ID',
+      type: 'short-input',
+      canonicalParamId: 'sourcePresentationId',
+      placeholder: 'Enter source presentation ID',
+      dependsOn: ['credential'],
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'copy_presentation' },
+      required: true,
+    },
+    {
+      id: 'copyTitle',
+      title: 'Copy Title',
+      type: 'short-input',
+      placeholder: 'Title for the copy (defaults to "Copy of <source>")',
+      condition: { field: 'operation', value: 'copy_presentation' },
+    },
+    {
+      id: 'copyFolderSelector',
+      title: 'Destination Folder',
+      type: 'file-selector',
+      canonicalParamId: 'copyFolderId',
+      serviceId: 'google-drive',
+      selectorKey: 'google.drive',
+      requiredScopes: [],
+      mimeType: 'application/vnd.google-apps.folder',
+      placeholder: 'Select destination folder (optional)',
+      dependsOn: ['credential'],
+      mode: 'basic',
+      condition: { field: 'operation', value: 'copy_presentation' },
+    },
+    {
+      id: 'manualCopyFolderId',
+      title: 'Destination Folder ID',
+      type: 'short-input',
+      canonicalParamId: 'copyFolderId',
+      placeholder: 'Folder ID (optional)',
+      dependsOn: ['credential'],
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'copy_presentation' },
+    },
+
+    // ========== Export Presentation Operation Fields ==========
+    {
+      id: 'exportFormat',
+      title: 'Export Format',
+      type: 'dropdown',
+      options: [
+        { label: 'PDF', id: 'PDF' },
+        { label: 'PowerPoint (PPTX)', id: 'PPTX' },
+        { label: 'OpenDocument (ODP)', id: 'ODP' },
+        { label: 'Plain Text', id: 'TXT' },
+        { label: 'PNG (first slide)', id: 'PNG' },
+        { label: 'JPEG (first slide)', id: 'JPEG' },
+        { label: 'SVG (first slide)', id: 'SVG' },
+      ],
+      value: () => 'PDF',
+      condition: { field: 'operation', value: 'export_presentation' },
+    },
+
+    // ========== Batch Update (Raw) Operation Fields ==========
+    {
+      id: 'requestsJson',
+      title: 'Requests (JSON Array)',
+      type: 'long-input',
+      placeholder:
+        'JSON array of Slides API Request objects, e.g. [{"replaceAllText":{...}}, {"updatePageProperties":{...}}]',
+      condition: { field: 'operation', value: 'batch_update' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Produce a JSON array of Google Slides API Request objects matching the user's intent. Each item must be a valid Request — for example {"replaceAllText": {...}}, {"updateTextStyle": {...}}, {"createSlide": {...}}. Return ONLY the JSON array, no commentary.`,
+        placeholder: 'Describe the batch update you want to run...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'writeControlJson',
+      title: 'Write Control (JSON)',
+      type: 'long-input',
+      placeholder: '{"requiredRevisionId":"..."} or {"targetRevisionId":"..."}',
+      condition: { field: 'operation', value: 'batch_update' },
+      mode: 'advanced',
+    },
+
+    // ========== Replace All Shapes With Image Fields ==========
+    {
+      id: 'replaceShapesImageUrl',
+      title: 'Image URL',
+      type: 'short-input',
+      placeholder: 'Publicly fetchable image URL (PNG, JPEG, GIF)',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_image' },
+      required: true,
+    },
+    {
+      id: 'replaceShapesFindText',
+      title: 'Find Text (Token)',
+      type: 'short-input',
+      placeholder: 'Shape text token, e.g. {{cover-image}}',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_image' },
+      required: true,
+    },
+    {
+      id: 'replaceShapesMatchCase',
+      title: 'Match Case',
+      type: 'switch',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_image' },
+    },
+    {
+      id: 'replaceShapesImageMethod',
+      title: 'Image Fit',
+      type: 'dropdown',
+      options: [
+        { label: 'Center Inside (preserve aspect)', id: 'CENTER_INSIDE' },
+        { label: 'Center Crop (fill, crop)', id: 'CENTER_CROP' },
+      ],
+      value: () => 'CENTER_INSIDE',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_image' },
+    },
+    {
+      id: 'replaceShapesPageObjectIds',
+      title: 'Limit to Slides (IDs)',
+      type: 'short-input',
+      placeholder: 'Comma-separated slide IDs (empty = all)',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_image' },
+      mode: 'advanced',
+    },
+
+    // ========== Replace Image Fields ==========
+    {
+      id: 'replaceImageObjectId',
+      title: 'Image Object ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the existing image to replace',
+      condition: { field: 'operation', value: 'replace_image' },
+      required: true,
+    },
+    {
+      id: 'replaceImageUrl',
+      title: 'New Image URL',
+      type: 'short-input',
+      placeholder: 'Publicly fetchable image URL',
+      condition: { field: 'operation', value: 'replace_image' },
+      required: true,
+    },
+    {
+      id: 'replaceImageMethod',
+      title: 'Image Fit',
+      type: 'dropdown',
+      options: [
+        { label: 'Center Inside (preserve aspect)', id: 'CENTER_INSIDE' },
+        { label: 'Center Crop (fill, crop)', id: 'CENTER_CROP' },
+      ],
+      value: () => 'CENTER_INSIDE',
+      condition: { field: 'operation', value: 'replace_image' },
+    },
+
+    // ========== Update Image Properties Fields ==========
+    {
+      id: 'imagePropsObjectId',
+      title: 'Image Object ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the image',
+      condition: { field: 'operation', value: 'update_image_properties' },
+      required: true,
+    },
+    {
+      id: 'imageBrightness',
+      title: 'Brightness',
+      type: 'short-input',
+      placeholder: '-1.0 to 1.0',
+      condition: { field: 'operation', value: 'update_image_properties' },
+    },
+    {
+      id: 'imageContrast',
+      title: 'Contrast',
+      type: 'short-input',
+      placeholder: '-1.0 to 1.0',
+      condition: { field: 'operation', value: 'update_image_properties' },
+    },
+    {
+      id: 'imageTransparency',
+      title: 'Transparency',
+      type: 'short-input',
+      placeholder: '0.0 (opaque) to 1.0 (transparent)',
+      condition: { field: 'operation', value: 'update_image_properties' },
+    },
+    {
+      id: 'imageLinkUrl',
+      title: 'Link URL',
+      type: 'short-input',
+      placeholder: 'Make the image a hyperlink',
+      condition: { field: 'operation', value: 'update_image_properties' },
+    },
+    {
+      id: 'imageOutlineColor',
+      title: 'Outline Color',
+      type: 'short-input',
+      placeholder: 'Hex, e.g. #1A73E8',
+      condition: { field: 'operation', value: 'update_image_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'imageOutlineWeight',
+      title: 'Outline Weight (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_image_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'imageOutlineDashStyle',
+      title: 'Outline Dash Style',
+      type: 'short-input',
+      placeholder: 'SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+      condition: { field: 'operation', value: 'update_image_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'imagePropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      placeholder: 'Raw ImageProperties JSON (merged with the simple fields)',
+      condition: { field: 'operation', value: 'update_image_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'imagePropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated field mask',
+      condition: { field: 'operation', value: 'update_image_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Text Style Fields ==========
+    {
+      id: 'textObjectId',
+      title: 'Object ID',
+      type: 'short-input',
+      placeholder: 'Shape or table object ID containing the text',
+      condition: {
+        field: 'operation',
+        value: [
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'textRowIndex',
+      title: 'Table Cell Row Index',
+      type: 'short-input',
+      placeholder: 'Zero-based row (for table cells only)',
+      condition: {
+        field: 'operation',
+        value: [
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+        ],
+      },
+      mode: 'advanced',
+    },
+    {
+      id: 'textColumnIndex',
+      title: 'Table Cell Column Index',
+      type: 'short-input',
+      placeholder: 'Zero-based column (for table cells only)',
+      condition: {
+        field: 'operation',
+        value: [
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+        ],
+      },
+      mode: 'advanced',
+    },
+    {
+      id: 'textRangeType',
+      title: 'Range Type',
+      type: 'dropdown',
+      options: [
+        { label: 'All Text', id: 'ALL' },
+        { label: 'From Start Index', id: 'FROM_START_INDEX' },
+        { label: 'Fixed Range', id: 'FIXED_RANGE' },
+      ],
+      value: () => 'ALL',
+      condition: {
+        field: 'operation',
+        value: [
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+        ],
+      },
+    },
+    {
+      id: 'textStartIndex',
+      title: 'Start Index',
+      type: 'short-input',
+      placeholder: 'Required for FROM_START_INDEX or FIXED_RANGE',
+      condition: {
+        field: 'operation',
+        value: [
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+        ],
+      },
+      mode: 'advanced',
+    },
+    {
+      id: 'textEndIndex',
+      title: 'End Index',
+      type: 'short-input',
+      placeholder: 'Required for FIXED_RANGE',
+      condition: {
+        field: 'operation',
+        value: [
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+        ],
+      },
+      mode: 'advanced',
+    },
+
+    // update_text_style specific
+    {
+      id: 'textBold',
+      title: 'Bold',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_text_style' },
+    },
+    {
+      id: 'textItalic',
+      title: 'Italic',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_text_style' },
+    },
+    {
+      id: 'textUnderline',
+      title: 'Underline',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_text_style' },
+    },
+    {
+      id: 'textStrikethrough',
+      title: 'Strikethrough',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_text_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'textSmallCaps',
+      title: 'Small Caps',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_text_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'textFontFamily',
+      title: 'Font Family',
+      type: 'short-input',
+      placeholder: 'e.g. Inter, Roboto, Arial',
+      condition: { field: 'operation', value: 'update_text_style' },
+    },
+    {
+      id: 'textFontSize',
+      title: 'Font Size (pt)',
+      type: 'short-input',
+      placeholder: 'Numeric, e.g. 14',
+      condition: { field: 'operation', value: 'update_text_style' },
+    },
+    {
+      id: 'textForegroundColor',
+      title: 'Text Color',
+      type: 'short-input',
+      placeholder: 'Hex, e.g. #1A73E8',
+      condition: { field: 'operation', value: 'update_text_style' },
+    },
+    {
+      id: 'textBackgroundColor',
+      title: 'Text Background Color',
+      type: 'short-input',
+      placeholder: 'Hex, e.g. #FFF8E1',
+      condition: { field: 'operation', value: 'update_text_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'textLinkUrl',
+      title: 'Link URL',
+      type: 'short-input',
+      placeholder: 'Hyperlink URL for the range',
+      condition: { field: 'operation', value: 'update_text_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'textBaselineOffset',
+      title: 'Baseline Offset',
+      type: 'dropdown',
+      options: [
+        { label: 'None', id: 'NONE' },
+        { label: 'Superscript', id: 'SUPERSCRIPT' },
+        { label: 'Subscript', id: 'SUBSCRIPT' },
+      ],
+      condition: { field: 'operation', value: 'update_text_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'textStyleJson',
+      title: 'Style JSON (advanced)',
+      type: 'long-input',
+      placeholder: 'Raw TextStyle JSON (merged with the simple fields)',
+      condition: { field: 'operation', value: 'update_text_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'textStyleFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated field mask',
+      condition: { field: 'operation', value: 'update_text_style' },
+      mode: 'advanced',
+    },
+
+    // update_paragraph_style specific
+    {
+      id: 'paragraphAlignment',
+      title: 'Alignment',
+      type: 'dropdown',
+      options: [
+        { label: 'Start', id: 'START' },
+        { label: 'Center', id: 'CENTER' },
+        { label: 'End', id: 'END' },
+        { label: 'Justified', id: 'JUSTIFIED' },
+      ],
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+    },
+    {
+      id: 'paragraphLineSpacing',
+      title: 'Line Spacing (%)',
+      type: 'short-input',
+      placeholder: '100 = single, 200 = double',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+    },
+    {
+      id: 'paragraphIndentStart',
+      title: 'Indent Start (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphIndentEnd',
+      title: 'Indent End (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphIndentFirstLine',
+      title: 'First-Line Indent (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphSpaceAbove',
+      title: 'Space Above (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphSpaceBelow',
+      title: 'Space Below (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphDirection',
+      title: 'Direction',
+      type: 'dropdown',
+      options: [
+        { label: 'Left to Right', id: 'LEFT_TO_RIGHT' },
+        { label: 'Right to Left', id: 'RIGHT_TO_LEFT' },
+      ],
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphSpacingMode',
+      title: 'Spacing Mode',
+      type: 'dropdown',
+      options: [
+        { label: 'Never Collapse', id: 'NEVER_COLLAPSE' },
+        { label: 'Collapse Lists', id: 'COLLAPSE_LISTS' },
+      ],
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphStyleJson',
+      title: 'Style JSON (advanced)',
+      type: 'long-input',
+      placeholder: 'Raw ParagraphStyle JSON (merged with the simple fields)',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+    {
+      id: 'paragraphStyleFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. alignment,lineSpacing,indentStart',
+      condition: { field: 'operation', value: 'update_paragraph_style' },
+      mode: 'advanced',
+    },
+
+    // create_paragraph_bullets specific
+    {
+      id: 'bulletPreset',
+      title: 'Bullet Preset',
+      type: 'dropdown',
+      options: [
+        { label: 'Disc / Circle / Square', id: 'BULLET_DISC_CIRCLE_SQUARE' },
+        { label: 'Diamond / Arrow / Disc', id: 'BULLET_DIAMONDX_ARROW3D_SQUARE' },
+        { label: 'Checkbox', id: 'BULLET_CHECKBOX' },
+        { label: 'Arrow / Diamond / Disc', id: 'BULLET_ARROW_DIAMOND_DISC' },
+        { label: 'Star / Circle / Disc', id: 'BULLET_STAR_CIRCLE_DISC' },
+        { label: 'Arrow3D / Circle / Square', id: 'BULLET_ARROW3D_CIRCLE_SQUARE' },
+        { label: 'Left Triangle / Diamond / Disc', id: 'BULLET_LEFTTRIANGLE_DIAMOND_DISC' },
+        { label: 'Numbered Digit/Alpha/Roman', id: 'NUMBERED_DIGIT_ALPHA_ROMAN' },
+        { label: 'Numbered Digit/Alpha/Roman (parens)', id: 'NUMBERED_DIGIT_ALPHA_ROMAN_PARENS' },
+        { label: 'Numbered Digit Nested', id: 'NUMBERED_DIGIT_NESTED' },
+        { label: 'Numbered Upper Alpha / Alpha / Roman', id: 'NUMBERED_UPPERALPHA_ALPHA_ROMAN' },
+        {
+          label: 'Numbered Upper Roman / Upper Alpha / Digit',
+          id: 'NUMBERED_UPPERROMAN_UPPERALPHA_DIGIT',
+        },
+        { label: 'Numbered Zero-Digit / Alpha / Roman', id: 'NUMBERED_ZERODIGIT_ALPHA_ROMAN' },
+      ],
+      value: () => 'BULLET_DISC_CIRCLE_SQUARE',
+      condition: { field: 'operation', value: 'create_paragraph_bullets' },
+    },
+
+    // ========== Update Shape Properties Fields ==========
+    {
+      id: 'shapePropsObjectId',
+      title: 'Shape Object ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the shape',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      required: true,
+    },
+    {
+      id: 'shapeFillColor',
+      title: 'Fill Color',
+      type: 'short-input',
+      placeholder: 'Hex, e.g. #FF6F61',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+    },
+    {
+      id: 'shapeFillAlpha',
+      title: 'Fill Opacity',
+      type: 'short-input',
+      placeholder: '0.0 to 1.0',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'shapeFillUnset',
+      title: 'Clear Fill (inherit)',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'shapeOutlineColor',
+      title: 'Outline Color',
+      type: 'short-input',
+      placeholder: 'Hex',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+    },
+    {
+      id: 'shapeOutlineWeight',
+      title: 'Outline Weight (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+    },
+    {
+      id: 'shapeOutlineDashStyle',
+      title: 'Outline Dash Style',
+      type: 'short-input',
+      placeholder: 'SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'shapeOutlineUnset',
+      title: 'Clear Outline (inherit)',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'shapeLinkUrl',
+      title: 'Link URL',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'shapeContentAlignment',
+      title: 'Content Alignment',
+      type: 'dropdown',
+      options: [
+        { label: 'Top', id: 'TOP' },
+        { label: 'Middle', id: 'MIDDLE' },
+        { label: 'Bottom', id: 'BOTTOM' },
+      ],
+      condition: { field: 'operation', value: 'update_shape_properties' },
+    },
+    {
+      id: 'shapeAutofitType',
+      title: 'Autofit',
+      type: 'dropdown',
+      options: [
+        { label: 'None', id: 'NONE' },
+        { label: 'Text Autofit', id: 'TEXT_AUTOFIT' },
+        { label: 'Shape Autofit', id: 'SHAPE_AUTOFIT' },
+      ],
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'shapePropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'shapePropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. shapeBackgroundFill,outline,contentAlignment',
+      condition: { field: 'operation', value: 'update_shape_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Update Page Properties Fields ==========
+    {
+      id: 'pagePropsObjectId',
+      title: 'Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide',
+      condition: { field: 'operation', value: 'update_page_properties' },
+      required: true,
+    },
+    {
+      id: 'pageBackgroundColor',
+      title: 'Background Color',
+      type: 'short-input',
+      placeholder: 'Hex, e.g. #0B1F3A',
+      condition: { field: 'operation', value: 'update_page_properties' },
+    },
+    {
+      id: 'pageBackgroundAlpha',
+      title: 'Background Opacity',
+      type: 'short-input',
+      placeholder: '0.0 to 1.0',
+      condition: { field: 'operation', value: 'update_page_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'pageBackgroundImageUrl',
+      title: 'Background Image URL',
+      type: 'short-input',
+      placeholder: 'Publicly fetchable image URL',
+      condition: { field: 'operation', value: 'update_page_properties' },
+    },
+    {
+      id: 'pageBackgroundUnset',
+      title: 'Clear Background (inherit)',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_page_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'pagePropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_page_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'pagePropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. pageBackgroundFill',
+      condition: { field: 'operation', value: 'update_page_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Update Slide Properties Fields ==========
+    {
+      id: 'slidePropsObjectId',
+      title: 'Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide',
+      condition: { field: 'operation', value: 'update_slide_properties' },
+      required: true,
+    },
+    {
+      id: 'slideIsSkipped',
+      title: 'Skip Slide in Presentation',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_slide_properties' },
+    },
+    {
+      id: 'slidePropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_slide_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'slidePropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. isSkipped',
+      condition: { field: 'operation', value: 'update_slide_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Update Alt Text Fields ==========
+    {
+      id: 'altTextObjectId',
+      title: 'Element Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_page_element_alt_text' },
+      required: true,
+    },
+    {
+      id: 'altTextTitle',
+      title: 'Accessibility Title',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_page_element_alt_text' },
+    },
+    {
+      id: 'altTextDescription',
+      title: 'Accessibility Description',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_page_element_alt_text' },
+    },
+
+    // ========== Update Element Transform Fields ==========
+    {
+      id: 'transformObjectId',
+      title: 'Element Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+      required: true,
+    },
+    {
+      id: 'transformScaleX',
+      title: 'Scale X',
+      type: 'short-input',
+      placeholder: 'Default 1',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+    },
+    {
+      id: 'transformScaleY',
+      title: 'Scale Y',
+      type: 'short-input',
+      placeholder: 'Default 1',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+    },
+    {
+      id: 'transformShearX',
+      title: 'Shear X',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+      mode: 'advanced',
+    },
+    {
+      id: 'transformShearY',
+      title: 'Shear Y',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+      mode: 'advanced',
+    },
+    {
+      id: 'transformTranslateX',
+      title: 'X Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+    },
+    {
+      id: 'transformTranslateY',
+      title: 'Y Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+    },
+    {
+      id: 'transformApplyMode',
+      title: 'Apply Mode',
+      type: 'dropdown',
+      options: [
+        { label: 'Absolute (replace)', id: 'ABSOLUTE' },
+        { label: 'Relative (multiply)', id: 'RELATIVE' },
+      ],
+      value: () => 'ABSOLUTE',
+      condition: { field: 'operation', value: 'update_page_element_transform' },
+    },
+
+    // ========== Z-Order Fields ==========
+    {
+      id: 'zOrderObjectIds',
+      title: 'Object IDs',
+      type: 'short-input',
+      placeholder: 'Comma-separated element IDs',
+      condition: { field: 'operation', value: 'update_page_elements_z_order' },
+      required: true,
+    },
+    {
+      id: 'zOrderOperation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Bring to Front', id: 'BRING_TO_FRONT' },
+        { label: 'Bring Forward', id: 'BRING_FORWARD' },
+        { label: 'Send Backward', id: 'SEND_BACKWARD' },
+        { label: 'Send to Back', id: 'SEND_TO_BACK' },
+      ],
+      condition: { field: 'operation', value: 'update_page_elements_z_order' },
+      required: true,
+    },
+
+    // ========== Group / Ungroup Fields ==========
+    {
+      id: 'groupChildrenObjectIds',
+      title: 'Children Object IDs',
+      type: 'short-input',
+      placeholder: 'Comma-separated element IDs (same slide)',
+      condition: { field: 'operation', value: 'group_objects' },
+      required: true,
+    },
+    {
+      id: 'groupObjectIdInput',
+      title: 'Group ID (optional)',
+      type: 'short-input',
+      placeholder: 'Custom group object ID',
+      condition: { field: 'operation', value: 'group_objects' },
+      mode: 'advanced',
+    },
+    {
+      id: 'ungroupObjectIds',
+      title: 'Group Object IDs',
+      type: 'short-input',
+      placeholder: 'Comma-separated group IDs',
+      condition: { field: 'operation', value: 'ungroup_objects' },
+      required: true,
+    },
+
+    // ========== Create Line Fields ==========
+    {
+      id: 'linePageObjectId',
+      title: 'Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide',
+      condition: { field: 'operation', value: 'create_line' },
+      required: true,
+    },
+    {
+      id: 'lineCategory',
+      title: 'Line Category',
+      type: 'dropdown',
+      options: [
+        { label: 'Straight', id: 'STRAIGHT' },
+        { label: 'Bent', id: 'BENT' },
+        { label: 'Curved', id: 'CURVED' },
+      ],
+      value: () => 'STRAIGHT',
+      condition: { field: 'operation', value: 'create_line' },
+    },
+    {
+      id: 'lineWidth',
+      title: 'Width (pt)',
+      type: 'short-input',
+      placeholder: 'Default 200',
+      condition: { field: 'operation', value: 'create_line' },
+    },
+    {
+      id: 'lineHeight',
+      title: 'Height (pt)',
+      type: 'short-input',
+      placeholder: 'Default 1',
+      condition: { field: 'operation', value: 'create_line' },
+    },
+    {
+      id: 'linePositionX',
+      title: 'X Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'create_line' },
+    },
+    {
+      id: 'linePositionY',
+      title: 'Y Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'create_line' },
+    },
+
+    // ========== Update Line Properties Fields ==========
+    {
+      id: 'linePropsObjectId',
+      title: 'Line Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_line_properties' },
+      required: true,
+    },
+    {
+      id: 'lineColor',
+      title: 'Line Color',
+      type: 'short-input',
+      placeholder: 'Hex',
+      condition: { field: 'operation', value: 'update_line_properties' },
+    },
+    {
+      id: 'lineWeight',
+      title: 'Line Weight (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_line_properties' },
+    },
+    {
+      id: 'lineDashStyle',
+      title: 'Dash Style',
+      type: 'short-input',
+      placeholder: 'SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+      condition: { field: 'operation', value: 'update_line_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'lineStartArrow',
+      title: 'Start Arrow',
+      type: 'short-input',
+      placeholder: 'NONE, STEALTH_ARROW, FILL_ARROW, OPEN_ARROW, ...',
+      condition: { field: 'operation', value: 'update_line_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'lineEndArrow',
+      title: 'End Arrow',
+      type: 'short-input',
+      placeholder: 'NONE, STEALTH_ARROW, FILL_ARROW, OPEN_ARROW, ...',
+      condition: { field: 'operation', value: 'update_line_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'lineLinkUrl',
+      title: 'Link URL',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_line_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'linePropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_line_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'linePropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. lineFill,weight,dashStyle',
+      condition: { field: 'operation', value: 'update_line_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Update Line Category Fields ==========
+    {
+      id: 'lineCategoryObjectId',
+      title: 'Line Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_line_category' },
+      required: true,
+    },
+    {
+      id: 'newLineCategory',
+      title: 'Line Category',
+      type: 'dropdown',
+      options: [
+        { label: 'Straight', id: 'STRAIGHT' },
+        { label: 'Bent', id: 'BENT' },
+        { label: 'Curved', id: 'CURVED' },
+      ],
+      condition: { field: 'operation', value: 'update_line_category' },
+      required: true,
+    },
+
+    // ========== Reroute Line Fields ==========
+    {
+      id: 'rerouteLineObjectId',
+      title: 'Line Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'reroute_line' },
+      required: true,
+    },
+
+    // ========== Table Row/Column Insert/Delete Fields ==========
+    {
+      id: 'tableTargetObjectId',
+      title: 'Table Object ID',
+      type: 'short-input',
+      condition: {
+        field: 'operation',
+        value: [
+          'insert_table_rows',
+          'insert_table_columns',
+          'delete_table_row',
+          'delete_table_column',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'tableCellRowIndex',
+      title: 'Cell Row Index',
+      type: 'short-input',
+      placeholder: 'Zero-based',
+      condition: {
+        field: 'operation',
+        value: [
+          'insert_table_rows',
+          'insert_table_columns',
+          'delete_table_row',
+          'delete_table_column',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'tableCellColumnIndex',
+      title: 'Cell Column Index',
+      type: 'short-input',
+      placeholder: 'Zero-based',
+      condition: {
+        field: 'operation',
+        value: [
+          'insert_table_rows',
+          'insert_table_columns',
+          'delete_table_row',
+          'delete_table_column',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'tableInsertNumber',
+      title: 'Number to Insert',
+      type: 'short-input',
+      placeholder: 'Minimum 1',
+      condition: {
+        field: 'operation',
+        value: ['insert_table_rows', 'insert_table_columns'],
+      },
+      required: true,
+    },
+    {
+      id: 'tableInsertBelow',
+      title: 'Insert Below',
+      type: 'switch',
+      condition: { field: 'operation', value: 'insert_table_rows' },
+    },
+    {
+      id: 'tableInsertRight',
+      title: 'Insert Right',
+      type: 'switch',
+      condition: { field: 'operation', value: 'insert_table_columns' },
+    },
+
+    // ========== Merge / Unmerge / Cell / Border Table Range Fields ==========
+    {
+      id: 'tableRangeObjectId',
+      title: 'Table Object ID',
+      type: 'short-input',
+      condition: {
+        field: 'operation',
+        value: [
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'tableRangeRowIndex',
+      title: 'Range Start Row',
+      type: 'short-input',
+      placeholder: 'Zero-based',
+      condition: {
+        field: 'operation',
+        value: [
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'tableRangeColumnIndex',
+      title: 'Range Start Column',
+      type: 'short-input',
+      placeholder: 'Zero-based',
+      condition: {
+        field: 'operation',
+        value: [
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'tableRangeRowSpan',
+      title: 'Row Span',
+      type: 'short-input',
+      placeholder: 'Minimum 1',
+      condition: {
+        field: 'operation',
+        value: [
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+        ],
+      },
+      required: true,
+    },
+    {
+      id: 'tableRangeColumnSpan',
+      title: 'Column Span',
+      type: 'short-input',
+      placeholder: 'Minimum 1',
+      condition: {
+        field: 'operation',
+        value: [
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+        ],
+      },
+      required: true,
+    },
+
+    // ========== Update Table Cell Properties Fields ==========
+    {
+      id: 'tableCellBackgroundColor',
+      title: 'Cell Background Color',
+      type: 'short-input',
+      placeholder: 'Hex, e.g. #F1F3F4',
+      condition: { field: 'operation', value: 'update_table_cell_properties' },
+    },
+    {
+      id: 'tableCellBackgroundAlpha',
+      title: 'Background Opacity',
+      type: 'short-input',
+      placeholder: '0.0 to 1.0',
+      condition: { field: 'operation', value: 'update_table_cell_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'tableCellContentAlignment',
+      title: 'Content Alignment',
+      type: 'dropdown',
+      options: [
+        { label: 'Top', id: 'TOP' },
+        { label: 'Middle', id: 'MIDDLE' },
+        { label: 'Bottom', id: 'BOTTOM' },
+      ],
+      condition: { field: 'operation', value: 'update_table_cell_properties' },
+    },
+    {
+      id: 'tableCellPropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_table_cell_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'tableCellPropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. tableCellBackgroundFill,contentAlignment',
+      condition: { field: 'operation', value: 'update_table_cell_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Update Table Border Properties Fields ==========
+    {
+      id: 'tableBorderPosition',
+      title: 'Border Position',
+      type: 'dropdown',
+      options: [
+        { label: 'All', id: 'ALL' },
+        { label: 'Bottom', id: 'BOTTOM' },
+        { label: 'Inner', id: 'INNER' },
+        { label: 'Inner Horizontal', id: 'INNER_HORIZONTAL' },
+        { label: 'Inner Vertical', id: 'INNER_VERTICAL' },
+        { label: 'Left', id: 'LEFT' },
+        { label: 'Outer', id: 'OUTER' },
+        { label: 'Right', id: 'RIGHT' },
+        { label: 'Top', id: 'TOP' },
+      ],
+      value: () => 'ALL',
+      condition: { field: 'operation', value: 'update_table_border_properties' },
+    },
+    {
+      id: 'tableBorderColor',
+      title: 'Border Color',
+      type: 'short-input',
+      placeholder: 'Hex',
+      condition: { field: 'operation', value: 'update_table_border_properties' },
+    },
+    {
+      id: 'tableBorderWeight',
+      title: 'Border Weight (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_table_border_properties' },
+    },
+    {
+      id: 'tableBorderDashStyle',
+      title: 'Dash Style',
+      type: 'short-input',
+      placeholder: 'SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+      condition: { field: 'operation', value: 'update_table_border_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'tableBorderPropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_table_border_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'tableBorderPropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. tableBorderFill,weight,dashStyle',
+      condition: { field: 'operation', value: 'update_table_border_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Update Table Column Properties Fields ==========
+    {
+      id: 'tableColumnPropsObjectId',
+      title: 'Table Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_table_column_properties' },
+      required: true,
+    },
+    {
+      id: 'tableColumnIndices',
+      title: 'Column Indices',
+      type: 'short-input',
+      placeholder: 'Comma-separated, zero-based (e.g. "0,2,3")',
+      condition: { field: 'operation', value: 'update_table_column_properties' },
+      required: true,
+    },
+    {
+      id: 'tableColumnWidth',
+      title: 'Column Width (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_table_column_properties' },
+    },
+    {
+      id: 'tableColumnPropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_table_column_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'tableColumnPropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. columnWidth',
+      condition: { field: 'operation', value: 'update_table_column_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Update Table Row Properties Fields ==========
+    {
+      id: 'tableRowPropsObjectId',
+      title: 'Table Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_table_row_properties' },
+      required: true,
+    },
+    {
+      id: 'tableRowIndices',
+      title: 'Row Indices',
+      type: 'short-input',
+      placeholder: 'Comma-separated, zero-based',
+      condition: { field: 'operation', value: 'update_table_row_properties' },
+      required: true,
+    },
+    {
+      id: 'tableMinRowHeight',
+      title: 'Minimum Row Height (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_table_row_properties' },
+    },
+    {
+      id: 'tableRowPropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_table_row_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'tableRowPropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. minRowHeight',
+      condition: { field: 'operation', value: 'update_table_row_properties' },
+      mode: 'advanced',
+    },
+
+    // ========== Sheets Chart Embed Fields ==========
+    {
+      id: 'chartPageObjectId',
+      title: 'Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide to embed the chart on',
+      condition: { field: 'operation', value: 'create_sheets_chart' },
+      required: true,
+    },
+    {
+      id: 'chartSpreadsheetId',
+      title: 'Spreadsheet ID',
+      type: 'short-input',
+      condition: {
+        field: 'operation',
+        value: ['create_sheets_chart', 'replace_all_shapes_with_sheets_chart'],
+      },
+      required: true,
+    },
+    {
+      id: 'chartId',
+      title: 'Chart ID',
+      type: 'short-input',
+      placeholder: 'Numeric chart ID within the spreadsheet',
+      condition: {
+        field: 'operation',
+        value: ['create_sheets_chart', 'replace_all_shapes_with_sheets_chart'],
+      },
+      required: true,
+    },
+    {
+      id: 'chartLinkingMode',
+      title: 'Linking Mode',
+      type: 'dropdown',
+      options: [
+        { label: 'Linked (refreshable)', id: 'LINKED' },
+        { label: 'Static Image', id: 'NOT_LINKED_IMAGE' },
+      ],
+      value: () => 'LINKED',
+      condition: {
+        field: 'operation',
+        value: ['create_sheets_chart', 'replace_all_shapes_with_sheets_chart'],
+      },
+    },
+    {
+      id: 'chartWidth',
+      title: 'Width (pt)',
+      type: 'short-input',
+      placeholder: 'Default 400',
+      condition: { field: 'operation', value: 'create_sheets_chart' },
+    },
+    {
+      id: 'chartHeight',
+      title: 'Height (pt)',
+      type: 'short-input',
+      placeholder: 'Default 300',
+      condition: { field: 'operation', value: 'create_sheets_chart' },
+    },
+    {
+      id: 'chartPositionX',
+      title: 'X Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'create_sheets_chart' },
+    },
+    {
+      id: 'chartPositionY',
+      title: 'Y Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'create_sheets_chart' },
+    },
+
+    // ========== Refresh Sheets Chart Fields ==========
+    {
+      id: 'refreshChartObjectId',
+      title: 'Chart Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'refresh_sheets_chart' },
+      required: true,
+    },
+
+    // ========== Replace All Shapes With Sheets Chart Fields ==========
+    {
+      id: 'replaceShapesChartFindText',
+      title: 'Find Text (Token)',
+      type: 'short-input',
+      placeholder: 'Shape text token, e.g. {{revenue-chart}}',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_sheets_chart' },
+      required: true,
+    },
+    {
+      id: 'replaceShapesChartMatchCase',
+      title: 'Match Case',
+      type: 'switch',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_sheets_chart' },
+    },
+    {
+      id: 'replaceShapesChartPageObjectIds',
+      title: 'Limit to Slides (IDs)',
+      type: 'short-input',
+      placeholder: 'Comma-separated slide IDs (empty = all)',
+      condition: { field: 'operation', value: 'replace_all_shapes_with_sheets_chart' },
+      mode: 'advanced',
+    },
+
+    // ========== Create Video Fields ==========
+    {
+      id: 'videoPageObjectId',
+      title: 'Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide',
+      condition: { field: 'operation', value: 'create_video' },
+      required: true,
+    },
+    {
+      id: 'videoSource',
+      title: 'Source',
+      type: 'dropdown',
+      options: [
+        { label: 'YouTube', id: 'YOUTUBE' },
+        { label: 'Google Drive', id: 'DRIVE' },
+      ],
+      value: () => 'YOUTUBE',
+      condition: { field: 'operation', value: 'create_video' },
+      required: true,
+    },
+    {
+      id: 'videoId',
+      title: 'Video ID',
+      type: 'short-input',
+      placeholder: 'YouTube video ID or Drive file ID',
+      condition: { field: 'operation', value: 'create_video' },
+      required: true,
+    },
+    {
+      id: 'videoWidth',
+      title: 'Width (pt)',
+      type: 'short-input',
+      placeholder: 'Default 400',
+      condition: { field: 'operation', value: 'create_video' },
+    },
+    {
+      id: 'videoHeight',
+      title: 'Height (pt)',
+      type: 'short-input',
+      placeholder: 'Default 225',
+      condition: { field: 'operation', value: 'create_video' },
+    },
+    {
+      id: 'videoPositionX',
+      title: 'X Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'create_video' },
+    },
+    {
+      id: 'videoPositionY',
+      title: 'Y Position (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'create_video' },
+    },
+
+    // ========== Update Video Properties Fields ==========
+    {
+      id: 'videoPropsObjectId',
+      title: 'Video Object ID',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_video_properties' },
+      required: true,
+    },
+    {
+      id: 'videoAutoPlay',
+      title: 'Auto Play',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_video_properties' },
+    },
+    {
+      id: 'videoMute',
+      title: 'Mute',
+      type: 'switch',
+      condition: { field: 'operation', value: 'update_video_properties' },
+    },
+    {
+      id: 'videoStart',
+      title: 'Start (sec)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_video_properties' },
+    },
+    {
+      id: 'videoEnd',
+      title: 'End (sec)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_video_properties' },
+    },
+    {
+      id: 'videoOutlineColor',
+      title: 'Outline Color',
+      type: 'short-input',
+      placeholder: 'Hex',
+      condition: { field: 'operation', value: 'update_video_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'videoOutlineWeight',
+      title: 'Outline Weight (pt)',
+      type: 'short-input',
+      condition: { field: 'operation', value: 'update_video_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'videoOutlineDashStyle',
+      title: 'Outline Dash Style',
+      type: 'short-input',
+      placeholder: 'SOLID, DOT, DASH, ...',
+      condition: { field: 'operation', value: 'update_video_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'videoPropertiesJson',
+      title: 'Properties JSON (advanced)',
+      type: 'long-input',
+      condition: { field: 'operation', value: 'update_video_properties' },
+      mode: 'advanced',
+    },
+    {
+      id: 'videoPropertiesFields',
+      title: 'FieldMask (advanced)',
+      type: 'short-input',
+      placeholder: 'Comma-separated, e.g. autoPlay,mute,start,end',
+      condition: { field: 'operation', value: 'update_video_properties' },
+      mode: 'advanced',
+    },
   ],
   tools: {
     access: [
@@ -638,6 +2357,44 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
       'google_slides_create_table',
       'google_slides_create_shape',
       'google_slides_insert_text',
+      'google_slides_update_text_style',
+      'google_slides_update_paragraph_style',
+      'google_slides_delete_text',
+      'google_slides_create_paragraph_bullets',
+      'google_slides_delete_paragraph_bullets',
+      'google_slides_replace_all_shapes_with_image',
+      'google_slides_replace_image',
+      'google_slides_update_image_properties',
+      'google_slides_update_shape_properties',
+      'google_slides_update_page_properties',
+      'google_slides_update_slide_properties',
+      'google_slides_update_page_element_alt_text',
+      'google_slides_update_page_element_transform',
+      'google_slides_update_page_elements_z_order',
+      'google_slides_group_objects',
+      'google_slides_ungroup_objects',
+      'google_slides_create_line',
+      'google_slides_update_line_properties',
+      'google_slides_update_line_category',
+      'google_slides_reroute_line',
+      'google_slides_insert_table_rows',
+      'google_slides_insert_table_columns',
+      'google_slides_delete_table_row',
+      'google_slides_delete_table_column',
+      'google_slides_merge_table_cells',
+      'google_slides_unmerge_table_cells',
+      'google_slides_update_table_cell_properties',
+      'google_slides_update_table_border_properties',
+      'google_slides_update_table_column_properties',
+      'google_slides_update_table_row_properties',
+      'google_slides_create_sheets_chart',
+      'google_slides_refresh_sheets_chart',
+      'google_slides_replace_all_shapes_with_sheets_chart',
+      'google_slides_create_video',
+      'google_slides_update_video_properties',
+      'google_slides_batch_update',
+      'google_slides_copy_presentation',
+      'google_slides_export_presentation',
     ],
     config: {
       tool: (params) => {
@@ -670,6 +2427,82 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
             return 'google_slides_create_shape'
           case 'insert_text':
             return 'google_slides_insert_text'
+          case 'update_text_style':
+            return 'google_slides_update_text_style'
+          case 'update_paragraph_style':
+            return 'google_slides_update_paragraph_style'
+          case 'delete_text':
+            return 'google_slides_delete_text'
+          case 'create_paragraph_bullets':
+            return 'google_slides_create_paragraph_bullets'
+          case 'delete_paragraph_bullets':
+            return 'google_slides_delete_paragraph_bullets'
+          case 'replace_all_shapes_with_image':
+            return 'google_slides_replace_all_shapes_with_image'
+          case 'replace_image':
+            return 'google_slides_replace_image'
+          case 'update_image_properties':
+            return 'google_slides_update_image_properties'
+          case 'update_shape_properties':
+            return 'google_slides_update_shape_properties'
+          case 'update_page_properties':
+            return 'google_slides_update_page_properties'
+          case 'update_slide_properties':
+            return 'google_slides_update_slide_properties'
+          case 'update_page_element_alt_text':
+            return 'google_slides_update_page_element_alt_text'
+          case 'update_page_element_transform':
+            return 'google_slides_update_page_element_transform'
+          case 'update_page_elements_z_order':
+            return 'google_slides_update_page_elements_z_order'
+          case 'group_objects':
+            return 'google_slides_group_objects'
+          case 'ungroup_objects':
+            return 'google_slides_ungroup_objects'
+          case 'create_line':
+            return 'google_slides_create_line'
+          case 'update_line_properties':
+            return 'google_slides_update_line_properties'
+          case 'update_line_category':
+            return 'google_slides_update_line_category'
+          case 'reroute_line':
+            return 'google_slides_reroute_line'
+          case 'insert_table_rows':
+            return 'google_slides_insert_table_rows'
+          case 'insert_table_columns':
+            return 'google_slides_insert_table_columns'
+          case 'delete_table_row':
+            return 'google_slides_delete_table_row'
+          case 'delete_table_column':
+            return 'google_slides_delete_table_column'
+          case 'merge_table_cells':
+            return 'google_slides_merge_table_cells'
+          case 'unmerge_table_cells':
+            return 'google_slides_unmerge_table_cells'
+          case 'update_table_cell_properties':
+            return 'google_slides_update_table_cell_properties'
+          case 'update_table_border_properties':
+            return 'google_slides_update_table_border_properties'
+          case 'update_table_column_properties':
+            return 'google_slides_update_table_column_properties'
+          case 'update_table_row_properties':
+            return 'google_slides_update_table_row_properties'
+          case 'create_sheets_chart':
+            return 'google_slides_create_sheets_chart'
+          case 'refresh_sheets_chart':
+            return 'google_slides_refresh_sheets_chart'
+          case 'replace_all_shapes_with_sheets_chart':
+            return 'google_slides_replace_all_shapes_with_sheets_chart'
+          case 'create_video':
+            return 'google_slides_create_video'
+          case 'update_video_properties':
+            return 'google_slides_update_video_properties'
+          case 'batch_update':
+            return 'google_slides_batch_update'
+          case 'copy_presentation':
+            return 'google_slides_copy_presentation'
+          case 'export_presentation':
+            return 'google_slides_export_presentation'
           default:
             throw new Error(`Invalid Google Slides operation: ${params.operation}`)
         }
@@ -807,6 +2640,382 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
           }
         }
 
+        const toNum = (v: unknown): number | undefined => {
+          if (v === undefined || v === null || v === '') return undefined
+          const n = typeof v === 'number' ? v : Number.parseFloat(String(v))
+          return Number.isFinite(n) ? n : undefined
+        }
+
+        const TEXT_RANGE_OPS = new Set([
+          'update_text_style',
+          'update_paragraph_style',
+          'delete_text',
+          'create_paragraph_bullets',
+          'delete_paragraph_bullets',
+        ])
+        if (TEXT_RANGE_OPS.has(params.operation as string)) {
+          result.objectId = params.textObjectId
+          const rowIdx = toNum(params.textRowIndex)
+          const colIdx = toNum(params.textColumnIndex)
+          if (rowIdx !== undefined) result.rowIndex = rowIdx
+          if (colIdx !== undefined) result.columnIndex = colIdx
+          if (params.textRangeType) result.rangeType = params.textRangeType
+          const startIdx = toNum(params.textStartIndex)
+          const endIdx = toNum(params.textEndIndex)
+          if (startIdx !== undefined) result.startIndex = startIdx
+          if (endIdx !== undefined) result.endIndex = endIdx
+        }
+
+        if (params.operation === 'update_text_style') {
+          if (params.textBold !== undefined) result.bold = params.textBold
+          if (params.textItalic !== undefined) result.italic = params.textItalic
+          if (params.textUnderline !== undefined) result.underline = params.textUnderline
+          if (params.textStrikethrough !== undefined)
+            result.strikethrough = params.textStrikethrough
+          if (params.textSmallCaps !== undefined) result.smallCaps = params.textSmallCaps
+          if (params.textFontFamily) result.fontFamily = params.textFontFamily
+          const fontSize = toNum(params.textFontSize)
+          if (fontSize !== undefined) result.fontSize = fontSize
+          if (params.textForegroundColor) result.foregroundColor = params.textForegroundColor
+          if (params.textBackgroundColor) result.backgroundColor = params.textBackgroundColor
+          if (params.textLinkUrl) result.linkUrl = params.textLinkUrl
+          if (params.textBaselineOffset) result.baselineOffset = params.textBaselineOffset
+          if (params.textStyleJson) result.styleJson = params.textStyleJson
+          if (params.textStyleFields) result.fields = params.textStyleFields
+        }
+
+        if (params.operation === 'update_paragraph_style') {
+          if (params.paragraphAlignment) result.alignment = params.paragraphAlignment
+          const ls = toNum(params.paragraphLineSpacing)
+          if (ls !== undefined) result.lineSpacing = ls
+          const indentStart = toNum(params.paragraphIndentStart)
+          if (indentStart !== undefined) result.indentStart = indentStart
+          const indentEnd = toNum(params.paragraphIndentEnd)
+          if (indentEnd !== undefined) result.indentEnd = indentEnd
+          const indentFirst = toNum(params.paragraphIndentFirstLine)
+          if (indentFirst !== undefined) result.indentFirstLine = indentFirst
+          const spaceAbove = toNum(params.paragraphSpaceAbove)
+          if (spaceAbove !== undefined) result.spaceAbove = spaceAbove
+          const spaceBelow = toNum(params.paragraphSpaceBelow)
+          if (spaceBelow !== undefined) result.spaceBelow = spaceBelow
+          if (params.paragraphDirection) result.direction = params.paragraphDirection
+          if (params.paragraphSpacingMode) result.spacingMode = params.paragraphSpacingMode
+          if (params.paragraphStyleJson) result.styleJson = params.paragraphStyleJson
+          if (params.paragraphStyleFields) result.fields = params.paragraphStyleFields
+        }
+
+        if (params.operation === 'create_paragraph_bullets' && params.bulletPreset) {
+          result.bulletPreset = params.bulletPreset
+        }
+
+        if (params.operation === 'replace_all_shapes_with_image') {
+          result.imageUrl = params.replaceShapesImageUrl
+          result.findText = params.replaceShapesFindText
+          if (params.replaceShapesMatchCase !== undefined)
+            result.matchCase = params.replaceShapesMatchCase
+          if (params.replaceShapesImageMethod)
+            result.imageReplaceMethod = params.replaceShapesImageMethod
+          if (params.replaceShapesPageObjectIds)
+            result.pageObjectIds = params.replaceShapesPageObjectIds
+        }
+
+        if (params.operation === 'replace_image') {
+          result.imageObjectId = params.replaceImageObjectId
+          result.imageUrl = params.replaceImageUrl
+          if (params.replaceImageMethod) result.imageReplaceMethod = params.replaceImageMethod
+        }
+
+        if (params.operation === 'update_image_properties') {
+          result.objectId = params.imagePropsObjectId
+          const brightness = toNum(params.imageBrightness)
+          if (brightness !== undefined) result.brightness = brightness
+          const contrast = toNum(params.imageContrast)
+          if (contrast !== undefined) result.contrast = contrast
+          const transparency = toNum(params.imageTransparency)
+          if (transparency !== undefined) result.transparency = transparency
+          if (params.imageLinkUrl) result.linkUrl = params.imageLinkUrl
+          if (params.imageOutlineColor) result.outlineColor = params.imageOutlineColor
+          const outlineWeight = toNum(params.imageOutlineWeight)
+          if (outlineWeight !== undefined) result.outlineWeight = outlineWeight
+          if (params.imageOutlineDashStyle) result.outlineDashStyle = params.imageOutlineDashStyle
+          if (params.imagePropertiesJson) result.propertiesJson = params.imagePropertiesJson
+          if (params.imagePropertiesFields) result.fields = params.imagePropertiesFields
+        }
+
+        if (params.operation === 'update_shape_properties') {
+          result.objectId = params.shapePropsObjectId
+          if (params.shapeFillColor) result.fillColor = params.shapeFillColor
+          const fillAlpha = toNum(params.shapeFillAlpha)
+          if (fillAlpha !== undefined) result.fillAlpha = fillAlpha
+          if (params.shapeFillUnset !== undefined) result.fillUnset = params.shapeFillUnset
+          if (params.shapeOutlineColor) result.outlineColor = params.shapeOutlineColor
+          const shapeOutlineWeight = toNum(params.shapeOutlineWeight)
+          if (shapeOutlineWeight !== undefined) result.outlineWeight = shapeOutlineWeight
+          if (params.shapeOutlineDashStyle) result.outlineDashStyle = params.shapeOutlineDashStyle
+          if (params.shapeOutlineUnset !== undefined) result.outlineUnset = params.shapeOutlineUnset
+          if (params.shapeLinkUrl) result.linkUrl = params.shapeLinkUrl
+          if (params.shapeContentAlignment) result.contentAlignment = params.shapeContentAlignment
+          if (params.shapeAutofitType) result.autofitType = params.shapeAutofitType
+          if (params.shapePropertiesJson) result.propertiesJson = params.shapePropertiesJson
+          if (params.shapePropertiesFields) result.fields = params.shapePropertiesFields
+        }
+
+        if (params.operation === 'update_page_properties') {
+          result.objectId = params.pagePropsObjectId
+          if (params.pageBackgroundColor) result.backgroundColor = params.pageBackgroundColor
+          const bgAlpha = toNum(params.pageBackgroundAlpha)
+          if (bgAlpha !== undefined) result.backgroundAlpha = bgAlpha
+          if (params.pageBackgroundImageUrl)
+            result.backgroundImageUrl = params.pageBackgroundImageUrl
+          if (params.pageBackgroundUnset !== undefined)
+            result.backgroundUnset = params.pageBackgroundUnset
+          if (params.pagePropertiesJson) result.propertiesJson = params.pagePropertiesJson
+          if (params.pagePropertiesFields) result.fields = params.pagePropertiesFields
+        }
+
+        if (params.operation === 'update_slide_properties') {
+          result.objectId = params.slidePropsObjectId
+          if (params.slideIsSkipped !== undefined) result.isSkipped = params.slideIsSkipped
+          if (params.slidePropertiesJson) result.propertiesJson = params.slidePropertiesJson
+          if (params.slidePropertiesFields) result.fields = params.slidePropertiesFields
+        }
+
+        if (params.operation === 'update_page_element_alt_text') {
+          result.objectId = params.altTextObjectId
+          if (params.altTextTitle !== undefined) result.title = params.altTextTitle
+          if (params.altTextDescription !== undefined)
+            result.description = params.altTextDescription
+        }
+
+        if (params.operation === 'update_page_element_transform') {
+          result.objectId = params.transformObjectId
+          const sx = toNum(params.transformScaleX)
+          const sy = toNum(params.transformScaleY)
+          const shx = toNum(params.transformShearX)
+          const shy = toNum(params.transformShearY)
+          const tx = toNum(params.transformTranslateX)
+          const ty = toNum(params.transformTranslateY)
+          if (sx !== undefined) result.scaleX = sx
+          if (sy !== undefined) result.scaleY = sy
+          if (shx !== undefined) result.shearX = shx
+          if (shy !== undefined) result.shearY = shy
+          if (tx !== undefined) result.translateX = tx
+          if (ty !== undefined) result.translateY = ty
+          if (params.transformApplyMode) result.applyMode = params.transformApplyMode
+        }
+
+        if (params.operation === 'update_page_elements_z_order') {
+          result.objectIds = params.zOrderObjectIds
+          // Always overwrite — even when zOrderOperation is empty — so the block-level
+          // operation name 'update_page_elements_z_order' can never leak through as the
+          // z-order enum value and produce a confusing API error.
+          result.operation = params.zOrderOperation || undefined
+        }
+
+        if (params.operation === 'group_objects') {
+          result.childrenObjectIds = params.groupChildrenObjectIds
+          if (params.groupObjectIdInput) result.groupObjectId = params.groupObjectIdInput
+        }
+
+        if (params.operation === 'ungroup_objects') {
+          result.objectIds = params.ungroupObjectIds
+        }
+
+        if (params.operation === 'create_line') {
+          result.pageObjectId = params.linePageObjectId
+          if (params.lineCategory) result.lineCategory = params.lineCategory
+          const lw = toNum(params.lineWidth)
+          const lh = toNum(params.lineHeight)
+          const lpx = toNum(params.linePositionX)
+          const lpy = toNum(params.linePositionY)
+          if (lw !== undefined) result.width = lw
+          if (lh !== undefined) result.height = lh
+          if (lpx !== undefined) result.positionX = lpx
+          if (lpy !== undefined) result.positionY = lpy
+        }
+
+        if (params.operation === 'update_line_properties') {
+          result.objectId = params.linePropsObjectId
+          if (params.lineColor) result.lineColor = params.lineColor
+          const lineWeight = toNum(params.lineWeight)
+          if (lineWeight !== undefined) result.lineWeight = lineWeight
+          if (params.lineDashStyle) result.dashStyle = params.lineDashStyle
+          if (params.lineStartArrow) result.startArrow = params.lineStartArrow
+          if (params.lineEndArrow) result.endArrow = params.lineEndArrow
+          if (params.lineLinkUrl) result.linkUrl = params.lineLinkUrl
+          if (params.linePropertiesJson) result.propertiesJson = params.linePropertiesJson
+          if (params.linePropertiesFields) result.fields = params.linePropertiesFields
+        }
+
+        if (params.operation === 'update_line_category') {
+          result.objectId = params.lineCategoryObjectId
+          if (params.newLineCategory) result.lineCategory = params.newLineCategory
+        }
+
+        if (params.operation === 'reroute_line') {
+          result.objectId = params.rerouteLineObjectId
+        }
+
+        const TABLE_CELL_REF_OPS = new Set([
+          'insert_table_rows',
+          'insert_table_columns',
+          'delete_table_row',
+          'delete_table_column',
+        ])
+        if (TABLE_CELL_REF_OPS.has(params.operation as string)) {
+          result.tableObjectId = params.tableTargetObjectId
+          const rIdx = toNum(params.tableCellRowIndex)
+          const cIdx = toNum(params.tableCellColumnIndex)
+          if (rIdx !== undefined) result.rowIndex = rIdx
+          if (cIdx !== undefined) result.columnIndex = cIdx
+        }
+        if (
+          params.operation === 'insert_table_rows' ||
+          params.operation === 'insert_table_columns'
+        ) {
+          const n = toNum(params.tableInsertNumber)
+          if (n !== undefined) result.number = n
+        }
+        if (params.operation === 'insert_table_rows' && params.tableInsertBelow !== undefined) {
+          result.insertBelow = params.tableInsertBelow
+        }
+        if (params.operation === 'insert_table_columns' && params.tableInsertRight !== undefined) {
+          result.insertRight = params.tableInsertRight
+        }
+
+        const TABLE_RANGE_OPS = new Set([
+          'merge_table_cells',
+          'unmerge_table_cells',
+          'update_table_cell_properties',
+          'update_table_border_properties',
+        ])
+        if (TABLE_RANGE_OPS.has(params.operation as string)) {
+          result.objectId = params.tableRangeObjectId
+          const rIdx = toNum(params.tableRangeRowIndex)
+          const cIdx = toNum(params.tableRangeColumnIndex)
+          const rSpan = toNum(params.tableRangeRowSpan)
+          const cSpan = toNum(params.tableRangeColumnSpan)
+          if (rIdx !== undefined) result.rowIndex = rIdx
+          if (cIdx !== undefined) result.columnIndex = cIdx
+          if (rSpan !== undefined) result.rowSpan = rSpan
+          if (cSpan !== undefined) result.columnSpan = cSpan
+        }
+
+        if (params.operation === 'update_table_cell_properties') {
+          if (params.tableCellBackgroundColor)
+            result.backgroundColor = params.tableCellBackgroundColor
+          const cellAlpha = toNum(params.tableCellBackgroundAlpha)
+          if (cellAlpha !== undefined) result.backgroundAlpha = cellAlpha
+          if (params.tableCellContentAlignment)
+            result.contentAlignment = params.tableCellContentAlignment
+          if (params.tableCellPropertiesJson) result.propertiesJson = params.tableCellPropertiesJson
+          if (params.tableCellPropertiesFields) result.fields = params.tableCellPropertiesFields
+        }
+
+        if (params.operation === 'update_table_border_properties') {
+          if (params.tableBorderPosition) result.borderPosition = params.tableBorderPosition
+          if (params.tableBorderColor) result.borderColor = params.tableBorderColor
+          const borderWeight = toNum(params.tableBorderWeight)
+          if (borderWeight !== undefined) result.borderWeight = borderWeight
+          if (params.tableBorderDashStyle) result.dashStyle = params.tableBorderDashStyle
+          if (params.tableBorderPropertiesJson)
+            result.propertiesJson = params.tableBorderPropertiesJson
+          if (params.tableBorderPropertiesFields) result.fields = params.tableBorderPropertiesFields
+        }
+
+        if (params.operation === 'update_table_column_properties') {
+          result.objectId = params.tableColumnPropsObjectId
+          if (params.tableColumnIndices) result.columnIndices = params.tableColumnIndices
+          const colWidth = toNum(params.tableColumnWidth)
+          if (colWidth !== undefined) result.columnWidth = colWidth
+          if (params.tableColumnPropertiesJson)
+            result.propertiesJson = params.tableColumnPropertiesJson
+          if (params.tableColumnPropertiesFields) result.fields = params.tableColumnPropertiesFields
+        }
+
+        if (params.operation === 'update_table_row_properties') {
+          result.objectId = params.tableRowPropsObjectId
+          if (params.tableRowIndices) result.rowIndices = params.tableRowIndices
+          const minHeight = toNum(params.tableMinRowHeight)
+          if (minHeight !== undefined) result.minRowHeight = minHeight
+          if (params.tableRowPropertiesJson) result.propertiesJson = params.tableRowPropertiesJson
+          if (params.tableRowPropertiesFields) result.fields = params.tableRowPropertiesFields
+        }
+
+        if (params.operation === 'create_sheets_chart') {
+          result.pageObjectId = params.chartPageObjectId
+          if (params.chartSpreadsheetId) result.spreadsheetId = params.chartSpreadsheetId
+          const cId = toNum(params.chartId)
+          if (cId !== undefined) result.chartId = cId
+          if (params.chartLinkingMode) result.linkingMode = params.chartLinkingMode
+          const cw = toNum(params.chartWidth)
+          const ch = toNum(params.chartHeight)
+          const cpx = toNum(params.chartPositionX)
+          const cpy = toNum(params.chartPositionY)
+          if (cw !== undefined) result.width = cw
+          if (ch !== undefined) result.height = ch
+          if (cpx !== undefined) result.positionX = cpx
+          if (cpy !== undefined) result.positionY = cpy
+        }
+
+        if (params.operation === 'refresh_sheets_chart') {
+          result.objectId = params.refreshChartObjectId
+        }
+
+        if (params.operation === 'replace_all_shapes_with_sheets_chart') {
+          if (params.chartSpreadsheetId) result.spreadsheetId = params.chartSpreadsheetId
+          const cId = toNum(params.chartId)
+          if (cId !== undefined) result.chartId = cId
+          result.findText = params.replaceShapesChartFindText
+          if (params.replaceShapesChartMatchCase !== undefined)
+            result.matchCase = params.replaceShapesChartMatchCase
+          if (params.chartLinkingMode) result.linkingMode = params.chartLinkingMode
+          if (params.replaceShapesChartPageObjectIds)
+            result.pageObjectIds = params.replaceShapesChartPageObjectIds
+        }
+
+        if (params.operation === 'create_video') {
+          result.pageObjectId = params.videoPageObjectId
+          if (params.videoSource) result.source = params.videoSource
+          if (params.videoId) result.videoId = params.videoId
+          const vw = toNum(params.videoWidth)
+          const vh = toNum(params.videoHeight)
+          const vpx = toNum(params.videoPositionX)
+          const vpy = toNum(params.videoPositionY)
+          if (vw !== undefined) result.width = vw
+          if (vh !== undefined) result.height = vh
+          if (vpx !== undefined) result.positionX = vpx
+          if (vpy !== undefined) result.positionY = vpy
+        }
+
+        if (params.operation === 'update_video_properties') {
+          result.objectId = params.videoPropsObjectId
+          if (params.videoAutoPlay !== undefined) result.autoPlay = params.videoAutoPlay
+          if (params.videoMute !== undefined) result.mute = params.videoMute
+          const vStart = toNum(params.videoStart)
+          const vEnd = toNum(params.videoEnd)
+          if (vStart !== undefined) result.start = vStart
+          if (vEnd !== undefined) result.end = vEnd
+          if (params.videoOutlineColor) result.outlineColor = params.videoOutlineColor
+          const voWeight = toNum(params.videoOutlineWeight)
+          if (voWeight !== undefined) result.outlineWeight = voWeight
+          if (params.videoOutlineDashStyle) result.outlineDashStyle = params.videoOutlineDashStyle
+          if (params.videoPropertiesJson) result.propertiesJson = params.videoPropertiesJson
+          if (params.videoPropertiesFields) result.fields = params.videoPropertiesFields
+        }
+
+        if (params.operation === 'batch_update') {
+          if (params.requestsJson) result.requests = params.requestsJson
+          if (params.writeControlJson) result.writeControl = params.writeControlJson
+        }
+
+        if (params.operation === 'copy_presentation') {
+          if (params.sourcePresentationId) result.sourcePresentationId = params.sourcePresentationId
+          if (params.copyTitle) result.title = params.copyTitle
+          if (params.copyFolderId) result.folderId = params.copyFolderId
+          result.presentationId = undefined
+        }
+
         return result
       },
     },
@@ -874,6 +3083,244 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
     insertTextObjectId: { type: 'string', description: 'Object ID for text insertion' },
     insertTextContent: { type: 'string', description: 'Text to insert' },
     insertTextIndex: { type: 'number', description: 'Insertion index' },
+
+    // Copy presentation operation
+    sourcePresentationId: { type: 'string', description: 'Source/template presentation ID' },
+    copyTitle: { type: 'string', description: 'Title for the copy' },
+    copyFolderId: { type: 'string', description: 'Destination folder ID for the copy' },
+
+    // Export presentation operation
+    exportFormat: { type: 'string', description: 'Export format (PDF, PPTX, ODP, etc.)' },
+
+    // Batch update (raw)
+    requestsJson: { type: 'string', description: 'JSON array of raw Slides API Request objects' },
+    writeControlJson: { type: 'string', description: 'WriteControl JSON object' },
+
+    // Replace all shapes with image
+    replaceShapesImageUrl: { type: 'string', description: 'Image URL to insert' },
+    replaceShapesFindText: { type: 'string', description: 'Text token of shapes to replace' },
+    replaceShapesMatchCase: { type: 'boolean', description: 'Match case' },
+    replaceShapesImageMethod: { type: 'string', description: 'Image fit method' },
+    replaceShapesPageObjectIds: { type: 'string', description: 'Slide IDs to limit to' },
+
+    // Replace image
+    replaceImageObjectId: { type: 'string', description: 'Image object ID to replace' },
+    replaceImageUrl: { type: 'string', description: 'New image URL' },
+    replaceImageMethod: { type: 'string', description: 'Image fit method' },
+
+    // Update image properties
+    imagePropsObjectId: { type: 'string', description: 'Image object ID' },
+    imageBrightness: { type: 'number', description: 'Brightness -1.0 to 1.0' },
+    imageContrast: { type: 'number', description: 'Contrast -1.0 to 1.0' },
+    imageTransparency: { type: 'number', description: 'Transparency 0.0 to 1.0' },
+    imageLinkUrl: { type: 'string', description: 'Hyperlink URL' },
+    imageOutlineColor: { type: 'string', description: 'Outline color (hex)' },
+    imageOutlineWeight: { type: 'number', description: 'Outline weight (pt)' },
+    imageOutlineDashStyle: { type: 'string', description: 'Outline dash style' },
+    imagePropertiesJson: { type: 'string', description: 'Raw ImageProperties JSON' },
+    imagePropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Shared text range targeting
+    textObjectId: { type: 'string', description: 'Object ID for text styling target' },
+    textRowIndex: { type: 'number', description: 'Table cell row index' },
+    textColumnIndex: { type: 'number', description: 'Table cell column index' },
+    textRangeType: { type: 'string', description: 'Range type (ALL/FROM_START_INDEX/FIXED_RANGE)' },
+    textStartIndex: { type: 'number', description: 'Range start index' },
+    textEndIndex: { type: 'number', description: 'Range end index' },
+
+    // Update text style
+    textBold: { type: 'boolean', description: 'Bold' },
+    textItalic: { type: 'boolean', description: 'Italic' },
+    textUnderline: { type: 'boolean', description: 'Underline' },
+    textStrikethrough: { type: 'boolean', description: 'Strikethrough' },
+    textSmallCaps: { type: 'boolean', description: 'Small caps' },
+    textFontFamily: { type: 'string', description: 'Font family' },
+    textFontSize: { type: 'number', description: 'Font size in points' },
+    textForegroundColor: { type: 'string', description: 'Text color (hex)' },
+    textBackgroundColor: { type: 'string', description: 'Text background color (hex)' },
+    textLinkUrl: { type: 'string', description: 'Text hyperlink URL' },
+    textBaselineOffset: { type: 'string', description: 'Baseline offset' },
+    textStyleJson: { type: 'string', description: 'Raw TextStyle JSON' },
+    textStyleFields: { type: 'string', description: 'FieldMask' },
+
+    // Update paragraph style
+    paragraphAlignment: { type: 'string', description: 'Paragraph alignment' },
+    paragraphLineSpacing: { type: 'number', description: 'Line spacing percent' },
+    paragraphIndentStart: { type: 'number', description: 'Indent start (pt)' },
+    paragraphIndentEnd: { type: 'number', description: 'Indent end (pt)' },
+    paragraphIndentFirstLine: { type: 'number', description: 'First-line indent (pt)' },
+    paragraphSpaceAbove: { type: 'number', description: 'Space above (pt)' },
+    paragraphSpaceBelow: { type: 'number', description: 'Space below (pt)' },
+    paragraphDirection: { type: 'string', description: 'Text direction' },
+    paragraphSpacingMode: { type: 'string', description: 'Paragraph spacing mode' },
+    paragraphStyleJson: { type: 'string', description: 'Raw ParagraphStyle JSON' },
+    paragraphStyleFields: { type: 'string', description: 'FieldMask' },
+
+    // Bullets
+    bulletPreset: { type: 'string', description: 'Bullet preset' },
+
+    // Update shape properties
+    shapePropsObjectId: { type: 'string', description: 'Shape object ID' },
+    shapeFillColor: { type: 'string', description: 'Shape fill color (hex)' },
+    shapeFillAlpha: { type: 'number', description: 'Shape fill opacity' },
+    shapeFillUnset: { type: 'boolean', description: 'Clear shape fill' },
+    shapeOutlineColor: { type: 'string', description: 'Shape outline color (hex)' },
+    shapeOutlineWeight: { type: 'number', description: 'Shape outline weight (pt)' },
+    shapeOutlineDashStyle: { type: 'string', description: 'Shape outline dash style' },
+    shapeOutlineUnset: { type: 'boolean', description: 'Clear shape outline' },
+    shapeLinkUrl: { type: 'string', description: 'Shape hyperlink URL' },
+    shapeContentAlignment: { type: 'string', description: 'Shape content alignment' },
+    shapeAutofitType: { type: 'string', description: 'Shape autofit type' },
+    shapePropertiesJson: { type: 'string', description: 'Raw ShapeProperties JSON' },
+    shapePropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Update page properties
+    pagePropsObjectId: { type: 'string', description: 'Slide object ID' },
+    pageBackgroundColor: { type: 'string', description: 'Slide background color (hex)' },
+    pageBackgroundAlpha: { type: 'number', description: 'Slide background opacity' },
+    pageBackgroundImageUrl: { type: 'string', description: 'Slide background image URL' },
+    pageBackgroundUnset: { type: 'boolean', description: 'Clear slide background' },
+    pagePropertiesJson: { type: 'string', description: 'Raw PageProperties JSON' },
+    pagePropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Update slide properties
+    slidePropsObjectId: { type: 'string', description: 'Slide object ID' },
+    slideIsSkipped: { type: 'boolean', description: 'Whether the slide is skipped' },
+    slidePropertiesJson: { type: 'string', description: 'Raw SlideProperties JSON' },
+    slidePropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Alt text
+    altTextObjectId: { type: 'string', description: 'Element object ID' },
+    altTextTitle: { type: 'string', description: 'Accessibility title' },
+    altTextDescription: { type: 'string', description: 'Accessibility description' },
+
+    // Transform
+    transformObjectId: { type: 'string', description: 'Element object ID' },
+    transformScaleX: { type: 'number', description: 'Scale X' },
+    transformScaleY: { type: 'number', description: 'Scale Y' },
+    transformShearX: { type: 'number', description: 'Shear X' },
+    transformShearY: { type: 'number', description: 'Shear Y' },
+    transformTranslateX: { type: 'number', description: 'X position (pt)' },
+    transformTranslateY: { type: 'number', description: 'Y position (pt)' },
+    transformApplyMode: { type: 'string', description: 'Apply mode' },
+
+    // Z-order
+    zOrderObjectIds: { type: 'string', description: 'Comma-separated element IDs' },
+    zOrderOperation: { type: 'string', description: 'Z-order operation' },
+
+    // Group / ungroup
+    groupChildrenObjectIds: { type: 'string', description: 'Children object IDs' },
+    groupObjectIdInput: { type: 'string', description: 'Group object ID' },
+    ungroupObjectIds: { type: 'string', description: 'Group object IDs to ungroup' },
+
+    // Create line
+    linePageObjectId: { type: 'string', description: 'Slide object ID' },
+    lineCategory: { type: 'string', description: 'Line category' },
+    lineWidth: { type: 'number', description: 'Line width (pt)' },
+    lineHeight: { type: 'number', description: 'Line height (pt)' },
+    linePositionX: { type: 'number', description: 'Line X position (pt)' },
+    linePositionY: { type: 'number', description: 'Line Y position (pt)' },
+
+    // Update line properties
+    linePropsObjectId: { type: 'string', description: 'Line object ID' },
+    lineColor: { type: 'string', description: 'Line color (hex)' },
+    lineWeight: { type: 'number', description: 'Line weight (pt)' },
+    lineDashStyle: { type: 'string', description: 'Line dash style' },
+    lineStartArrow: { type: 'string', description: 'Line start arrow' },
+    lineEndArrow: { type: 'string', description: 'Line end arrow' },
+    lineLinkUrl: { type: 'string', description: 'Line hyperlink URL' },
+    linePropertiesJson: { type: 'string', description: 'Raw LineProperties JSON' },
+    linePropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Update line category
+    lineCategoryObjectId: { type: 'string', description: 'Line object ID' },
+    newLineCategory: { type: 'string', description: 'New line category' },
+
+    // Reroute line
+    rerouteLineObjectId: { type: 'string', description: 'Line object ID' },
+
+    // Table cell-reference ops
+    tableTargetObjectId: { type: 'string', description: 'Table object ID' },
+    tableCellRowIndex: { type: 'number', description: 'Cell row index' },
+    tableCellColumnIndex: { type: 'number', description: 'Cell column index' },
+    tableInsertNumber: { type: 'number', description: 'Number of rows/columns to insert' },
+    tableInsertBelow: { type: 'boolean', description: 'Insert below reference cell' },
+    tableInsertRight: { type: 'boolean', description: 'Insert to the right of reference cell' },
+
+    // Table range ops
+    tableRangeObjectId: { type: 'string', description: 'Table object ID' },
+    tableRangeRowIndex: { type: 'number', description: 'Range start row' },
+    tableRangeColumnIndex: { type: 'number', description: 'Range start column' },
+    tableRangeRowSpan: { type: 'number', description: 'Row span' },
+    tableRangeColumnSpan: { type: 'number', description: 'Column span' },
+
+    // Update table cell properties
+    tableCellBackgroundColor: { type: 'string', description: 'Cell background color (hex)' },
+    tableCellBackgroundAlpha: { type: 'number', description: 'Cell background opacity' },
+    tableCellContentAlignment: { type: 'string', description: 'Cell content alignment' },
+    tableCellPropertiesJson: { type: 'string', description: 'Raw TableCellProperties JSON' },
+    tableCellPropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Update table border properties
+    tableBorderPosition: { type: 'string', description: 'Border position' },
+    tableBorderColor: { type: 'string', description: 'Border color (hex)' },
+    tableBorderWeight: { type: 'number', description: 'Border weight (pt)' },
+    tableBorderDashStyle: { type: 'string', description: 'Border dash style' },
+    tableBorderPropertiesJson: { type: 'string', description: 'Raw TableBorderProperties JSON' },
+    tableBorderPropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Update table column properties
+    tableColumnPropsObjectId: { type: 'string', description: 'Table object ID' },
+    tableColumnIndices: { type: 'string', description: 'Comma-separated column indices' },
+    tableColumnWidth: { type: 'number', description: 'Column width (pt)' },
+    tableColumnPropertiesJson: { type: 'string', description: 'Raw TableColumnProperties JSON' },
+    tableColumnPropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Update table row properties
+    tableRowPropsObjectId: { type: 'string', description: 'Table object ID' },
+    tableRowIndices: { type: 'string', description: 'Comma-separated row indices' },
+    tableMinRowHeight: { type: 'number', description: 'Minimum row height (pt)' },
+    tableRowPropertiesJson: { type: 'string', description: 'Raw TableRowProperties JSON' },
+    tableRowPropertiesFields: { type: 'string', description: 'FieldMask' },
+
+    // Sheets chart
+    chartPageObjectId: { type: 'string', description: 'Slide object ID' },
+    chartSpreadsheetId: { type: 'string', description: 'Spreadsheet ID' },
+    chartId: { type: 'number', description: 'Chart ID' },
+    chartLinkingMode: { type: 'string', description: 'Chart linking mode' },
+    chartWidth: { type: 'number', description: 'Chart width (pt)' },
+    chartHeight: { type: 'number', description: 'Chart height (pt)' },
+    chartPositionX: { type: 'number', description: 'Chart X position (pt)' },
+    chartPositionY: { type: 'number', description: 'Chart Y position (pt)' },
+
+    // Refresh sheets chart
+    refreshChartObjectId: { type: 'string', description: 'Chart object ID' },
+
+    // Replace all shapes with sheets chart
+    replaceShapesChartFindText: { type: 'string', description: 'Text token to replace' },
+    replaceShapesChartMatchCase: { type: 'boolean', description: 'Match case' },
+    replaceShapesChartPageObjectIds: { type: 'string', description: 'Slide IDs to limit to' },
+
+    // Create video
+    videoPageObjectId: { type: 'string', description: 'Slide object ID' },
+    videoSource: { type: 'string', description: 'Video source (YOUTUBE or DRIVE)' },
+    videoId: { type: 'string', description: 'Video ID' },
+    videoWidth: { type: 'number', description: 'Video width (pt)' },
+    videoHeight: { type: 'number', description: 'Video height (pt)' },
+    videoPositionX: { type: 'number', description: 'Video X position (pt)' },
+    videoPositionY: { type: 'number', description: 'Video Y position (pt)' },
+
+    // Update video properties
+    videoPropsObjectId: { type: 'string', description: 'Video object ID' },
+    videoAutoPlay: { type: 'boolean', description: 'Auto play' },
+    videoMute: { type: 'boolean', description: 'Mute' },
+    videoStart: { type: 'number', description: 'Playback start (sec)' },
+    videoEnd: { type: 'number', description: 'Playback end (sec)' },
+    videoOutlineColor: { type: 'string', description: 'Outline color (hex)' },
+    videoOutlineWeight: { type: 'number', description: 'Outline weight (pt)' },
+    videoOutlineDashStyle: { type: 'string', description: 'Outline dash style' },
+    videoPropertiesJson: { type: 'string', description: 'Raw VideoProperties JSON' },
+    videoPropertiesFields: { type: 'string', description: 'FieldMask' },
   },
   outputs: {
     // Read operation
@@ -912,6 +3359,62 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
     // Insert text operation
     inserted: { type: 'boolean', description: 'Whether text was inserted' },
     text: { type: 'string', description: 'Text that was inserted' },
+
+    // Generic update outputs (text style, paragraph style, shape/page/slide props, image/line/video props, table props)
+    updated: { type: 'boolean', description: 'Whether the operation updated the target' },
+    fields: { type: 'string', description: 'FieldMask that was applied' },
+
+    // Copy presentation
+    presentationId: { type: 'string', description: 'New presentation ID (copy)' },
+    title: { type: 'string', description: 'Presentation title' },
+
+    // Export presentation
+    contentBase64: { type: 'string', description: 'Base64-encoded exported content' },
+    mimeType: { type: 'string', description: 'MIME type of the exported content' },
+    sizeBytes: { type: 'number', description: 'Size of the exported content in bytes' },
+
+    // Batch update (raw)
+    replies: { type: 'json', description: 'Array of reply objects from batchUpdate' },
+    writeControl: { type: 'json', description: 'WriteControl from batchUpdate response' },
+
+    // Image / line / video object IDs
+    imageObjectId: { type: 'string', description: 'Image object ID' },
+    lineId: { type: 'string', description: 'Line object ID' },
+    videoObjectId: { type: 'string', description: 'Video object ID' },
+    chartObjectId: { type: 'string', description: 'Sheets chart object ID' },
+
+    // Replace image
+    replaced: { type: 'boolean', description: 'Whether the image was replaced' },
+
+    // Group / ungroup
+    grouped: { type: 'boolean', description: 'Whether objects were grouped' },
+    ungrouped: { type: 'boolean', description: 'Whether objects were ungrouped' },
+    groupObjectId: { type: 'string', description: 'Object ID of the resulting group' },
+    childrenObjectIds: { type: 'json', description: 'Children IDs of the group' },
+
+    // Z-order
+    reordered: { type: 'boolean', description: 'Whether the z-order was changed' },
+    objectIds: { type: 'json', description: 'Object IDs affected by the operation' },
+    operation: { type: 'string', description: 'Z-order operation applied' },
+
+    // Table extension
+    tableObjectId: { type: 'string', description: 'Table object ID affected' },
+    number: { type: 'number', description: 'Number of rows/columns inserted' },
+    merged: { type: 'boolean', description: 'Whether cells were merged' },
+    unmerged: { type: 'boolean', description: 'Whether cells were unmerged' },
+
+    // Sheets chart
+    refreshed: { type: 'boolean', description: 'Whether the chart was refreshed' },
+
+    // Line reroute
+    rerouted: { type: 'boolean', description: 'Whether the line was rerouted' },
+
+    // Paragraph bullets
+    created: { type: 'boolean', description: 'Whether bullets were created' },
+
+    // Bullets / shape / line categories returned
+    lineCategory: { type: 'string', description: 'Line category created or updated' },
+    shapeType: { type: 'string', description: 'Shape type created' },
   },
 }
 
diff --git a/apps/sim/tools/google_slides/batch_update.ts b/apps/sim/tools/google_slides/batch_update.ts
new file mode 100644
index 00000000000..a935614a936
--- /dev/null
+++ b/apps/sim/tools/google_slides/batch_update.ts
@@ -0,0 +1,139 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesBatchUpdateTool')
+
+interface BatchUpdateParams {
+  accessToken: string
+  presentationId: string
+  requests: string
+  writeControl?: string
+}
+
+interface BatchUpdateResponse {
+  success: boolean
+  output: {
+    replies: unknown[]
+    writeControl: unknown
+    metadata: { presentationId: string; url: string; requestCount: number }
+  }
+}
+
+export const batchUpdateTool: ToolConfig<BatchUpdateParams, BatchUpdateResponse> = {
+  id: 'google_slides_batch_update',
+  name: 'Batch Update Google Slides (Raw)',
+  description:
+    'Run a raw Slides API batchUpdate with a list of Request objects. Use this when the higher-level tools do not cover an operation, or to bundle multiple operations into a single atomic batch (all-or-nothing).',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    requests: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'JSON array of Slides API Request objects. Example: [{"replaceAllText":{"containsText":{"text":"{{title}}"},"replaceText":"Q3 Review"}}, {"updatePageProperties":{"objectId":"slide_1","pageProperties":{"pageBackgroundFill":{"solidFill":{"color":{"rgbColor":{"red":0.043,"green":0.122,"blue":0.231}}}}},"fields":"pageBackgroundFill"}}]',
+    },
+    writeControl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Optional JSON WriteControl object for optimistic concurrency, e.g. {"requiredRevisionId":"..."}',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const raw = params.requests
+      if (!raw) throw new Error('Requests JSON is required')
+
+      let requests: unknown
+      try {
+        requests = typeof raw === 'string' ? JSON.parse(raw) : raw
+      } catch (e) {
+        throw new Error(`Invalid requests JSON: ${(e as Error).message}`)
+      }
+      if (!Array.isArray(requests)) {
+        throw new Error('Requests must be a JSON array of Request objects')
+      }
+      if (requests.length === 0) {
+        throw new Error('Requests array must contain at least one Request')
+      }
+
+      const body: Record<string, unknown> = { requests }
+
+      if (params.writeControl?.trim()) {
+        try {
+          const wc = JSON.parse(params.writeControl)
+          if (wc && typeof wc === 'object') body.writeControl = wc
+        } catch (e) {
+          logger.warn('Invalid writeControl JSON, ignoring:', { error: e })
+        }
+      }
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Batch update failed')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    const replies: unknown[] = Array.isArray(data.replies) ? data.replies : []
+    return {
+      success: true,
+      output: {
+        replies,
+        writeControl: data.writeControl ?? null,
+        metadata: {
+          presentationId,
+          url: presentationUrl(presentationId),
+          requestCount: replies.length,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    replies: {
+      type: 'array',
+      description: 'Array of reply objects, one per request (parallel-indexed)',
+      items: { type: 'json' },
+    },
+    writeControl: {
+      type: 'json',
+      description: 'WriteControl returned by the server (revision tracking)',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+        requestCount: { type: 'number', description: 'Number of replies returned' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/copy_presentation.ts b/apps/sim/tools/google_slides/copy_presentation.ts
new file mode 100644
index 00000000000..9c258982916
--- /dev/null
+++ b/apps/sim/tools/google_slides/copy_presentation.ts
@@ -0,0 +1,128 @@
+import { createLogger } from '@sim/logger'
+import { presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesCopyPresentationTool')
+
+interface CopyPresentationParams {
+  accessToken: string
+  sourcePresentationId: string
+  title?: string
+  folderId?: string
+}
+
+interface CopyPresentationResponse {
+  success: boolean
+  output: {
+    presentationId: string
+    title: string
+    metadata: {
+      sourcePresentationId: string
+      presentationId: string
+      title: string
+      mimeType: string
+      url: string
+    }
+  }
+}
+
+const PRESENTATION_MIME = 'application/vnd.google-apps.presentation'
+
+export const copyPresentationTool: ToolConfig<CopyPresentationParams, CopyPresentationResponse> = {
+  id: 'google_slides_copy_presentation',
+  name: 'Copy Google Slides Presentation',
+  description:
+    'Copy a template presentation in Drive to a new file. Use this before merging data so the original template is never modified.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides / Drive API',
+    },
+    sourcePresentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Drive file ID of the source/template presentation',
+    },
+    title: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Title for the copy. Defaults to "Copy of <source title>".',
+    },
+    folderId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Drive folder ID where the copy should be placed',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const sourceId = params.sourcePresentationId?.trim()
+      if (!sourceId) throw new Error('Source presentation ID is required')
+      return `https://www.googleapis.com/drive/v3/files/${sourceId}/copy?supportsAllDrives=true`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) throw new Error('Access token is required')
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const body: Record<string, unknown> = {}
+      if (params.title?.trim()) body.name = params.title.trim()
+      if (params.folderId?.trim()) body.parents = [params.folderId.trim()]
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Drive API error during copy:', { data })
+      throw new Error(data.error?.message || 'Failed to copy presentation')
+    }
+    const presentationId: string = data.id
+    const title: string = data.name || 'Untitled Presentation'
+    return {
+      success: true,
+      output: {
+        presentationId,
+        title,
+        metadata: {
+          sourcePresentationId: params?.sourcePresentationId?.trim() || '',
+          presentationId,
+          title,
+          mimeType: PRESENTATION_MIME,
+          url: presentationUrl(presentationId),
+        },
+      },
+    }
+  },
+
+  outputs: {
+    presentationId: { type: 'string', description: 'ID of the new copied presentation' },
+    title: { type: 'string', description: 'Title of the new presentation' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        sourcePresentationId: { type: 'string', description: 'Source/template presentation ID' },
+        presentationId: { type: 'string', description: 'New presentation ID' },
+        title: { type: 'string', description: 'New presentation title' },
+        mimeType: { type: 'string', description: 'MIME type of the presentation' },
+        url: { type: 'string', description: 'URL to the new presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/create_line.ts b/apps/sim/tools/google_slides/create_line.ts
new file mode 100644
index 00000000000..9c86d04e72b
--- /dev/null
+++ b/apps/sim/tools/google_slides/create_line.ts
@@ -0,0 +1,157 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildElementProperties,
+  generateObjectId,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesCreateLineTool')
+
+interface CreateLineParams {
+  accessToken: string
+  presentationId: string
+  pageObjectId: string
+  lineCategory?: 'STRAIGHT' | 'BENT' | 'CURVED'
+  width?: number
+  height?: number
+  positionX?: number
+  positionY?: number
+}
+
+interface CreateLineResponse {
+  success: boolean
+  output: {
+    lineId: string
+    lineCategory: string
+    metadata: { presentationId: string; pageObjectId: string; url: string }
+  }
+}
+
+export const createLineTool: ToolConfig<CreateLineParams, CreateLineResponse> = {
+  id: 'google_slides_create_line',
+  name: 'Create Line in Google Slides',
+  description: 'Create a line or connector on a slide.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    pageObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the slide to add the line to',
+    },
+    lineCategory: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'STRAIGHT (default), BENT, or CURVED',
+    },
+    width: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Line width in points (default 200)',
+    },
+    height: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Line height in points (default 0 — horizontal line)',
+    },
+    positionX: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'X position in points (default 100)',
+    },
+    positionY: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Y position in points (default 100)',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const pageObjectId = params.pageObjectId?.trim()
+      if (!pageObjectId) throw new Error('Page Object ID is required')
+
+      const objectId = generateObjectId('line')
+      const elementProperties = buildElementProperties({
+        pageObjectId,
+        width: params.width,
+        height: params.height ?? 1,
+        positionX: params.positionX,
+        positionY: params.positionY,
+        defaultWidth: 200,
+        defaultHeight: 1,
+      })
+
+      return {
+        requests: [
+          {
+            createLine: {
+              objectId,
+              lineCategory: params.lineCategory || 'STRAIGHT',
+              elementProperties,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to create line')
+    }
+    const lineId = data.replies?.[0]?.createLine?.objectId ?? ''
+    const presentationId = params?.presentationId?.trim() || ''
+    const pageObjectId = params?.pageObjectId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        lineId,
+        lineCategory: params?.lineCategory || 'STRAIGHT',
+        metadata: { presentationId, pageObjectId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    lineId: { type: 'string', description: 'Object ID of the new line' },
+    lineCategory: { type: 'string', description: 'Line category created' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        pageObjectId: { type: 'string', description: 'The slide ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/create_paragraph_bullets.ts b/apps/sim/tools/google_slides/create_paragraph_bullets.ts
new file mode 100644
index 00000000000..05582db7b54
--- /dev/null
+++ b/apps/sim/tools/google_slides/create_paragraph_bullets.ts
@@ -0,0 +1,160 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildCellLocation,
+  buildTextRange,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesCreateParagraphBulletsTool')
+
+interface CreateParagraphBulletsParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex?: number
+  columnIndex?: number
+  rangeType?: 'ALL' | 'FROM_START_INDEX' | 'FIXED_RANGE'
+  startIndex?: number
+  endIndex?: number
+  bulletPreset?: string
+}
+
+interface CreateParagraphBulletsResponse {
+  success: boolean
+  output: {
+    created: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const createParagraphBulletsTool: ToolConfig<
+  CreateParagraphBulletsParams,
+  CreateParagraphBulletsResponse
+> = {
+  id: 'google_slides_create_paragraph_bullets',
+  name: 'Create Paragraph Bullets in Google Slides',
+  description:
+    'Convert paragraphs in a shape or table cell into a bulleted or numbered list using a Google Slides bullet preset.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the shape or table containing the text',
+    },
+    rowIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based row index',
+    },
+    columnIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based column index',
+    },
+    rangeType: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Range to apply bullets to: ALL (default), FROM_START_INDEX, or FIXED_RANGE',
+    },
+    startIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Start index for FROM_START_INDEX or FIXED_RANGE',
+    },
+    endIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'End index for FIXED_RANGE',
+    },
+    bulletPreset: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Bullet preset (e.g. BULLET_DISC_CIRCLE_SQUARE, BULLET_ARROW_DIAMOND_DISC, NUMBERED_DIGIT_ALPHA_ROMAN, NUMBERED_DIGIT_ALPHA_ROMAN_PARENS, NUMBERED_DIGIT_NESTED). Defaults to BULLET_DISC_CIRCLE_SQUARE.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const createRequest: Record<string, unknown> = {
+        objectId,
+        textRange: buildTextRange({
+          rangeType: params.rangeType,
+          startIndex: params.startIndex,
+          endIndex: params.endIndex,
+        }),
+        bulletPreset: params.bulletPreset?.trim() || 'BULLET_DISC_CIRCLE_SQUARE',
+      }
+      const cellLocation = buildCellLocation({
+        rowIndex: params.rowIndex,
+        columnIndex: params.columnIndex,
+      })
+      if (cellLocation) createRequest.cellLocation = cellLocation
+
+      return { requests: [{ createParagraphBullets: createRequest }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to create paragraph bullets')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        created: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    created: { type: 'boolean', description: 'Whether bullets were created' },
+    objectId: { type: 'string', description: 'The object where bullets were created' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/create_sheets_chart.ts b/apps/sim/tools/google_slides/create_sheets_chart.ts
new file mode 100644
index 00000000000..6452618a4a9
--- /dev/null
+++ b/apps/sim/tools/google_slides/create_sheets_chart.ts
@@ -0,0 +1,175 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildElementProperties,
+  generateObjectId,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesCreateSheetsChartTool')
+
+interface CreateSheetsChartParams {
+  accessToken: string
+  presentationId: string
+  pageObjectId: string
+  spreadsheetId: string
+  chartId: number
+  linkingMode?: 'LINKED' | 'NOT_LINKED_IMAGE'
+  width?: number
+  height?: number
+  positionX?: number
+  positionY?: number
+}
+
+interface CreateSheetsChartResponse {
+  success: boolean
+  output: {
+    chartObjectId: string
+    metadata: { presentationId: string; pageObjectId: string; url: string }
+  }
+}
+
+export const createSheetsChartTool: ToolConfig<CreateSheetsChartParams, CreateSheetsChartResponse> =
+  {
+    id: 'google_slides_create_sheets_chart',
+    name: 'Embed Google Sheets Chart in Slides',
+    description:
+      'Embed a chart from a Google Sheets spreadsheet onto a slide. LINKED charts can be refreshed; NOT_LINKED_IMAGE inserts a static image of the chart.',
+    version: '1.0.0',
+
+    oauth: { required: true, provider: 'google-drive' },
+
+    params: {
+      accessToken: {
+        type: 'string',
+        required: true,
+        visibility: 'hidden',
+        description: 'The access token for the Google Slides API',
+      },
+      presentationId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Google Slides presentation ID',
+      },
+      pageObjectId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Object ID of the slide to add the chart to',
+      },
+      spreadsheetId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Google Sheets spreadsheet ID containing the chart',
+      },
+      chartId: {
+        type: 'number',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Numeric chart ID within the spreadsheet',
+      },
+      linkingMode: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'LINKED (default) or NOT_LINKED_IMAGE',
+      },
+      width: {
+        type: 'number',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Width in points (default 400)',
+      },
+      height: {
+        type: 'number',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Height in points (default 300)',
+      },
+      positionX: {
+        type: 'number',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'X position in points (default 100)',
+      },
+      positionY: {
+        type: 'number',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Y position in points (default 100)',
+      },
+    },
+
+    request: {
+      url: (params) => batchUpdateUrl(params.presentationId),
+      method: 'POST',
+      headers: (params) => authJsonHeaders(params.accessToken),
+      body: (params) => {
+        const pageObjectId = params.pageObjectId?.trim()
+        const spreadsheetId = params.spreadsheetId?.trim()
+        if (!pageObjectId) throw new Error('Page Object ID is required')
+        if (!spreadsheetId) throw new Error('Spreadsheet ID is required')
+        if (params.chartId === undefined) throw new Error('Chart ID is required')
+
+        const objectId = generateObjectId('chart')
+        const elementProperties = buildElementProperties({
+          pageObjectId,
+          width: params.width,
+          height: params.height,
+          positionX: params.positionX,
+          positionY: params.positionY,
+          defaultWidth: 400,
+          defaultHeight: 300,
+        })
+
+        return {
+          requests: [
+            {
+              createSheetsChart: {
+                objectId,
+                spreadsheetId,
+                chartId: params.chartId,
+                linkingMode: params.linkingMode || 'LINKED',
+                elementProperties,
+              },
+            },
+          ],
+        }
+      },
+    },
+
+    transformResponse: async (response: Response, params) => {
+      const data = await response.json()
+      if (!response.ok) {
+        logger.error('Google Slides API error:', { data })
+        throw new Error(data.error?.message || 'Failed to create sheets chart')
+      }
+      const chartObjectId = data.replies?.[0]?.createSheetsChart?.objectId ?? ''
+      const presentationId = params?.presentationId?.trim() || ''
+      const pageObjectId = params?.pageObjectId?.trim() || ''
+      return {
+        success: true,
+        output: {
+          chartObjectId,
+          metadata: { presentationId, pageObjectId, url: presentationUrl(presentationId) },
+        },
+      }
+    },
+
+    outputs: {
+      chartObjectId: { type: 'string', description: 'Object ID of the inserted chart' },
+      metadata: {
+        type: 'object',
+        description: 'Operation metadata',
+        properties: {
+          presentationId: { type: 'string', description: 'The presentation ID' },
+          pageObjectId: { type: 'string', description: 'The slide ID' },
+          url: { type: 'string', description: 'URL to the presentation' },
+        },
+      },
+    },
+  }
diff --git a/apps/sim/tools/google_slides/create_video.ts b/apps/sim/tools/google_slides/create_video.ts
new file mode 100644
index 00000000000..bb15566904d
--- /dev/null
+++ b/apps/sim/tools/google_slides/create_video.ts
@@ -0,0 +1,165 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildElementProperties,
+  generateObjectId,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesCreateVideoTool')
+
+interface CreateVideoParams {
+  accessToken: string
+  presentationId: string
+  pageObjectId: string
+  source: 'YOUTUBE' | 'DRIVE'
+  videoId: string
+  width?: number
+  height?: number
+  positionX?: number
+  positionY?: number
+}
+
+interface CreateVideoResponse {
+  success: boolean
+  output: {
+    videoObjectId: string
+    metadata: { presentationId: string; pageObjectId: string; url: string }
+  }
+}
+
+export const createVideoTool: ToolConfig<CreateVideoParams, CreateVideoResponse> = {
+  id: 'google_slides_create_video',
+  name: 'Embed Video in Google Slides',
+  description: 'Embed a YouTube or Google Drive video on a slide.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    pageObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the slide to add the video to',
+    },
+    source: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'YOUTUBE or DRIVE',
+    },
+    videoId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'YouTube video ID or Drive file ID',
+    },
+    width: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Width in points (default 400)',
+    },
+    height: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Height in points (default 225)',
+    },
+    positionX: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'X position in points (default 100)',
+    },
+    positionY: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Y position in points (default 100)',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const pageObjectId = params.pageObjectId?.trim()
+      const videoId = params.videoId?.trim()
+      if (!pageObjectId) throw new Error('Page Object ID is required')
+      if (!videoId) throw new Error('Video ID is required')
+      if (!params.source) throw new Error('Source is required (YOUTUBE or DRIVE)')
+
+      const objectId = generateObjectId('video')
+      const elementProperties = buildElementProperties({
+        pageObjectId,
+        width: params.width,
+        height: params.height,
+        positionX: params.positionX,
+        positionY: params.positionY,
+        defaultWidth: 400,
+        defaultHeight: 225,
+      })
+
+      return {
+        requests: [
+          {
+            createVideo: {
+              objectId,
+              source: params.source,
+              id: videoId,
+              elementProperties,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to create video')
+    }
+    const videoObjectId = data.replies?.[0]?.createVideo?.objectId ?? ''
+    const presentationId = params?.presentationId?.trim() || ''
+    const pageObjectId = params?.pageObjectId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        videoObjectId,
+        metadata: { presentationId, pageObjectId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    videoObjectId: { type: 'string', description: 'Object ID of the inserted video' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        pageObjectId: { type: 'string', description: 'The slide ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/delete_paragraph_bullets.ts b/apps/sim/tools/google_slides/delete_paragraph_bullets.ts
new file mode 100644
index 00000000000..0364059cfde
--- /dev/null
+++ b/apps/sim/tools/google_slides/delete_paragraph_bullets.ts
@@ -0,0 +1,150 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildCellLocation,
+  buildTextRange,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesDeleteParagraphBulletsTool')
+
+interface DeleteParagraphBulletsParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex?: number
+  columnIndex?: number
+  rangeType?: 'ALL' | 'FROM_START_INDEX' | 'FIXED_RANGE'
+  startIndex?: number
+  endIndex?: number
+}
+
+interface DeleteParagraphBulletsResponse {
+  success: boolean
+  output: {
+    deleted: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const deleteParagraphBulletsTool: ToolConfig<
+  DeleteParagraphBulletsParams,
+  DeleteParagraphBulletsResponse
+> = {
+  id: 'google_slides_delete_paragraph_bullets',
+  name: 'Delete Paragraph Bullets in Google Slides',
+  description: 'Remove bullets/numbering from paragraphs in a shape or table cell.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the shape or table containing the text',
+    },
+    rowIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based row index',
+    },
+    columnIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based column index',
+    },
+    rangeType: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Range to clear bullets from: ALL (default), FROM_START_INDEX, or FIXED_RANGE',
+    },
+    startIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Start index for FROM_START_INDEX or FIXED_RANGE',
+    },
+    endIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'End index for FIXED_RANGE',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const deleteRequest: Record<string, unknown> = {
+        objectId,
+        textRange: buildTextRange({
+          rangeType: params.rangeType,
+          startIndex: params.startIndex,
+          endIndex: params.endIndex,
+        }),
+      }
+      const cellLocation = buildCellLocation({
+        rowIndex: params.rowIndex,
+        columnIndex: params.columnIndex,
+      })
+      if (cellLocation) deleteRequest.cellLocation = cellLocation
+
+      return { requests: [{ deleteParagraphBullets: deleteRequest }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to delete paragraph bullets')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        deleted: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether bullets were deleted' },
+    objectId: { type: 'string', description: 'The object whose bullets were deleted' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/delete_table_column.ts b/apps/sim/tools/google_slides/delete_table_column.ts
new file mode 100644
index 00000000000..14a08c1eb77
--- /dev/null
+++ b/apps/sim/tools/google_slides/delete_table_column.ts
@@ -0,0 +1,116 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesDeleteTableColumnTool')
+
+interface DeleteTableColumnParams {
+  accessToken: string
+  presentationId: string
+  tableObjectId: string
+  rowIndex: number
+  columnIndex: number
+}
+
+interface DeleteTableColumnResponse {
+  success: boolean
+  output: {
+    deleted: boolean
+    tableObjectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const deleteTableColumnTool: ToolConfig<DeleteTableColumnParams, DeleteTableColumnResponse> =
+  {
+    id: 'google_slides_delete_table_column',
+    name: 'Delete Table Column in Google Slides',
+    description: 'Delete the column containing the reference cell from a table.',
+    version: '1.0.0',
+
+    oauth: { required: true, provider: 'google-drive' },
+
+    params: {
+      accessToken: {
+        type: 'string',
+        required: true,
+        visibility: 'hidden',
+        description: 'The access token for the Google Slides API',
+      },
+      presentationId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Google Slides presentation ID',
+      },
+      tableObjectId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Object ID of the table',
+      },
+      rowIndex: {
+        type: 'number',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Zero-based row index of any cell in the column',
+      },
+      columnIndex: {
+        type: 'number',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Zero-based column index identifying the column to delete',
+      },
+    },
+
+    request: {
+      url: (params) => batchUpdateUrl(params.presentationId),
+      method: 'POST',
+      headers: (params) => authJsonHeaders(params.accessToken),
+      body: (params) => {
+        const tableObjectId = params.tableObjectId?.trim()
+        if (!tableObjectId) throw new Error('Table object ID is required')
+
+        return {
+          requests: [
+            {
+              deleteTableColumn: {
+                tableObjectId,
+                cellLocation: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+              },
+            },
+          ],
+        }
+      },
+    },
+
+    transformResponse: async (response: Response, params) => {
+      const data = await response.json()
+      if (!response.ok) {
+        logger.error('Google Slides API error:', { data })
+        throw new Error(data.error?.message || 'Failed to delete table column')
+      }
+      const presentationId = params?.presentationId?.trim() || ''
+      return {
+        success: true,
+        output: {
+          deleted: true,
+          tableObjectId: params?.tableObjectId?.trim() || '',
+          metadata: { presentationId, url: presentationUrl(presentationId) },
+        },
+      }
+    },
+
+    outputs: {
+      deleted: { type: 'boolean', description: 'Whether the column was deleted' },
+      tableObjectId: { type: 'string', description: 'The table updated' },
+      metadata: {
+        type: 'object',
+        description: 'Operation metadata',
+        properties: {
+          presentationId: { type: 'string', description: 'The presentation ID' },
+          url: { type: 'string', description: 'URL to the presentation' },
+        },
+      },
+    },
+  }
diff --git a/apps/sim/tools/google_slides/delete_table_row.ts b/apps/sim/tools/google_slides/delete_table_row.ts
new file mode 100644
index 00000000000..62f662b4976
--- /dev/null
+++ b/apps/sim/tools/google_slides/delete_table_row.ts
@@ -0,0 +1,115 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesDeleteTableRowTool')
+
+interface DeleteTableRowParams {
+  accessToken: string
+  presentationId: string
+  tableObjectId: string
+  rowIndex: number
+  columnIndex: number
+}
+
+interface DeleteTableRowResponse {
+  success: boolean
+  output: {
+    deleted: boolean
+    tableObjectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const deleteTableRowTool: ToolConfig<DeleteTableRowParams, DeleteTableRowResponse> = {
+  id: 'google_slides_delete_table_row',
+  name: 'Delete Table Row in Google Slides',
+  description: 'Delete the row containing the reference cell from a table.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    tableObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    rowIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based row index identifying the row to delete',
+    },
+    columnIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based column index of any cell in the row',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const tableObjectId = params.tableObjectId?.trim()
+      if (!tableObjectId) throw new Error('Table object ID is required')
+
+      return {
+        requests: [
+          {
+            deleteTableRow: {
+              tableObjectId,
+              cellLocation: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to delete table row')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        deleted: true,
+        tableObjectId: params?.tableObjectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether the row was deleted' },
+    tableObjectId: { type: 'string', description: 'The table updated' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/delete_text.ts b/apps/sim/tools/google_slides/delete_text.ts
new file mode 100644
index 00000000000..d618b2d3018
--- /dev/null
+++ b/apps/sim/tools/google_slides/delete_text.ts
@@ -0,0 +1,148 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildCellLocation,
+  buildTextRange,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesDeleteTextTool')
+
+interface DeleteTextParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex?: number
+  columnIndex?: number
+  rangeType?: 'ALL' | 'FROM_START_INDEX' | 'FIXED_RANGE'
+  startIndex?: number
+  endIndex?: number
+}
+
+interface DeleteTextResponse {
+  success: boolean
+  output: {
+    deleted: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const deleteTextTool: ToolConfig<DeleteTextParams, DeleteTextResponse> = {
+  id: 'google_slides_delete_text',
+  name: 'Delete Text in Google Slides',
+  description:
+    'Delete text from a shape or table cell. Use range type ALL to clear all text, or FIXED_RANGE / FROM_START_INDEX to delete a specific span.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the shape or table containing the text',
+    },
+    rowIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based row index',
+    },
+    columnIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based column index',
+    },
+    rangeType: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Range to delete: ALL (default), FROM_START_INDEX, or FIXED_RANGE',
+    },
+    startIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Start index for FROM_START_INDEX or FIXED_RANGE',
+    },
+    endIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'End index for FIXED_RANGE',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const deleteRequest: Record<string, unknown> = {
+        objectId,
+        textRange: buildTextRange({
+          rangeType: params.rangeType,
+          startIndex: params.startIndex,
+          endIndex: params.endIndex,
+        }),
+      }
+      const cellLocation = buildCellLocation({
+        rowIndex: params.rowIndex,
+        columnIndex: params.columnIndex,
+      })
+      if (cellLocation) deleteRequest.cellLocation = cellLocation
+
+      return { requests: [{ deleteText: deleteRequest }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to delete text')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        deleted: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether the text was deleted' },
+    objectId: { type: 'string', description: 'The object whose text was deleted' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/export_presentation.ts b/apps/sim/tools/google_slides/export_presentation.ts
new file mode 100644
index 00000000000..34553149411
--- /dev/null
+++ b/apps/sim/tools/google_slides/export_presentation.ts
@@ -0,0 +1,131 @@
+import { createLogger } from '@sim/logger'
+import { presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesExportPresentationTool')
+
+interface ExportPresentationParams {
+  accessToken: string
+  presentationId: string
+  exportFormat?: 'PDF' | 'PPTX' | 'ODP' | 'TXT' | 'PNG' | 'JPEG' | 'SVG'
+}
+
+interface ExportPresentationResponse {
+  success: boolean
+  output: {
+    contentBase64: string
+    mimeType: string
+    sizeBytes: number
+    metadata: { presentationId: string; url: string; exportFormat: string }
+  }
+}
+
+const FORMAT_TO_MIME: Record<string, string> = {
+  PDF: 'application/pdf',
+  PPTX: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  ODP: 'application/vnd.oasis.opendocument.presentation',
+  TXT: 'text/plain',
+  PNG: 'image/png',
+  JPEG: 'image/jpeg',
+  SVG: 'image/svg+xml',
+}
+
+export const exportPresentationTool: ToolConfig<
+  ExportPresentationParams,
+  ExportPresentationResponse
+> = {
+  id: 'google_slides_export_presentation',
+  name: 'Export Google Slides Presentation',
+  description:
+    'Export a presentation to PDF, PPTX, ODP, TXT, PNG, JPEG, or SVG via the Drive export endpoint. Returns the file content base64-encoded.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides / Drive API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    exportFormat: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Format: PDF (default), PPTX, ODP, TXT, PNG, JPEG, or SVG',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      if (!presentationId) throw new Error('Presentation ID is required')
+      const format = (params.exportFormat || 'PDF').toUpperCase()
+      const mime = FORMAT_TO_MIME[format]
+      if (!mime) throw new Error(`Unsupported export format: ${format}`)
+      return `https://www.googleapis.com/drive/v3/files/${presentationId}/export?mimeType=${encodeURIComponent(mime)}`
+    },
+    method: 'GET',
+    headers: (params) => {
+      if (!params.accessToken) throw new Error('Access token is required')
+      return { Authorization: `Bearer ${params.accessToken}` }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    if (!response.ok) {
+      let errorMessage = `Failed to export presentation (status ${response.status})`
+      try {
+        const data = await response.json()
+        errorMessage = data.error?.message || errorMessage
+        logger.error('Drive API error during export:', { data })
+      } catch {
+        // Body wasn't JSON — fall through with default error message.
+      }
+      throw new Error(errorMessage)
+    }
+
+    const buffer = await response.arrayBuffer()
+    const contentBase64 = Buffer.from(buffer).toString('base64')
+
+    const presentationId = params?.presentationId?.trim() || ''
+    const format = (params?.exportFormat || 'PDF').toUpperCase()
+    const mime = FORMAT_TO_MIME[format] ?? 'application/octet-stream'
+
+    return {
+      success: true,
+      output: {
+        contentBase64,
+        mimeType: mime,
+        sizeBytes: buffer.byteLength,
+        metadata: {
+          presentationId,
+          url: presentationUrl(presentationId),
+          exportFormat: format,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    contentBase64: { type: 'string', description: 'Base64-encoded exported file content' },
+    mimeType: { type: 'string', description: 'MIME type of the exported content' },
+    sizeBytes: { type: 'number', description: 'Size of the exported content in bytes' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+        exportFormat: { type: 'string', description: 'Export format used' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/group_objects.ts b/apps/sim/tools/google_slides/group_objects.ts
new file mode 100644
index 00000000000..1091c16ac6a
--- /dev/null
+++ b/apps/sim/tools/google_slides/group_objects.ts
@@ -0,0 +1,131 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  generateObjectId,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesGroupObjectsTool')
+
+interface GroupObjectsParams {
+  accessToken: string
+  presentationId: string
+  childrenObjectIds: string
+  groupObjectId?: string
+}
+
+interface GroupObjectsResponse {
+  success: boolean
+  output: {
+    grouped: boolean
+    groupObjectId: string
+    childrenObjectIds: string[]
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const groupObjectsTool: ToolConfig<GroupObjectsParams, GroupObjectsResponse> = {
+  id: 'google_slides_group_objects',
+  name: 'Group Objects in Google Slides',
+  description: 'Group two or more page elements on the same slide into a single object group.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    childrenObjectIds: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Comma-separated object IDs of the elements to group (must be on the same slide)',
+    },
+    groupObjectId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Optional object ID to assign to the new group',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const children = (params.childrenObjectIds || '')
+        .split(',')
+        .map((id) => id.trim())
+        .filter((id) => id.length > 0)
+      if (children.length < 2) throw new Error('At least two child object IDs are required')
+
+      const groupObjectId = params.groupObjectId?.trim() || generateObjectId('group')
+
+      return {
+        requests: [
+          {
+            groupObjects: {
+              groupObjectId,
+              childrenObjectIds: children,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to group objects')
+    }
+    const groupObjectId = data.replies?.[0]?.groupObjects?.objectId ?? params?.groupObjectId ?? ''
+    const presentationId = params?.presentationId?.trim() || ''
+    const children = (params?.childrenObjectIds || '')
+      .split(',')
+      .map((id) => id.trim())
+      .filter((id) => id.length > 0)
+    return {
+      success: true,
+      output: {
+        grouped: true,
+        groupObjectId,
+        childrenObjectIds: children,
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    grouped: { type: 'boolean', description: 'Whether the objects were grouped' },
+    groupObjectId: { type: 'string', description: 'Object ID of the new group' },
+    childrenObjectIds: {
+      type: 'array',
+      description: 'IDs of the grouped children',
+      items: { type: 'string' },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/index.ts b/apps/sim/tools/google_slides/index.ts
index 5245d87f919..26667bab8b4 100644
--- a/apps/sim/tools/google_slides/index.ts
+++ b/apps/sim/tools/google_slides/index.ts
@@ -1,16 +1,54 @@
 import { addImageTool } from '@/tools/google_slides/add_image'
 import { addSlideTool } from '@/tools/google_slides/add_slide'
+import { batchUpdateTool } from '@/tools/google_slides/batch_update'
+import { copyPresentationTool } from '@/tools/google_slides/copy_presentation'
 import { createTool } from '@/tools/google_slides/create'
+import { createLineTool } from '@/tools/google_slides/create_line'
+import { createParagraphBulletsTool } from '@/tools/google_slides/create_paragraph_bullets'
 import { createShapeTool } from '@/tools/google_slides/create_shape'
+import { createSheetsChartTool } from '@/tools/google_slides/create_sheets_chart'
 import { createTableTool } from '@/tools/google_slides/create_table'
+import { createVideoTool } from '@/tools/google_slides/create_video'
 import { deleteObjectTool } from '@/tools/google_slides/delete_object'
+import { deleteParagraphBulletsTool } from '@/tools/google_slides/delete_paragraph_bullets'
+import { deleteTableColumnTool } from '@/tools/google_slides/delete_table_column'
+import { deleteTableRowTool } from '@/tools/google_slides/delete_table_row'
+import { deleteTextTool } from '@/tools/google_slides/delete_text'
 import { duplicateObjectTool } from '@/tools/google_slides/duplicate_object'
+import { exportPresentationTool } from '@/tools/google_slides/export_presentation'
 import { getPageTool } from '@/tools/google_slides/get_page'
 import { getThumbnailTool } from '@/tools/google_slides/get_thumbnail'
+import { groupObjectsTool } from '@/tools/google_slides/group_objects'
+import { insertTableColumnsTool } from '@/tools/google_slides/insert_table_columns'
+import { insertTableRowsTool } from '@/tools/google_slides/insert_table_rows'
 import { insertTextTool } from '@/tools/google_slides/insert_text'
+import { mergeTableCellsTool } from '@/tools/google_slides/merge_table_cells'
 import { readTool } from '@/tools/google_slides/read'
+import { refreshSheetsChartTool } from '@/tools/google_slides/refresh_sheets_chart'
+import { replaceAllShapesWithImageTool } from '@/tools/google_slides/replace_all_shapes_with_image'
+import { replaceAllShapesWithSheetsChartTool } from '@/tools/google_slides/replace_all_shapes_with_sheets_chart'
 import { replaceAllTextTool } from '@/tools/google_slides/replace_all_text'
+import { replaceImageTool } from '@/tools/google_slides/replace_image'
+import { rerouteLineTool } from '@/tools/google_slides/reroute_line'
+import { ungroupObjectsTool } from '@/tools/google_slides/ungroup_objects'
+import { unmergeTableCellsTool } from '@/tools/google_slides/unmerge_table_cells'
+import { updateImagePropertiesTool } from '@/tools/google_slides/update_image_properties'
+import { updateLineCategoryTool } from '@/tools/google_slides/update_line_category'
+import { updateLinePropertiesTool } from '@/tools/google_slides/update_line_properties'
+import { updatePageElementAltTextTool } from '@/tools/google_slides/update_page_element_alt_text'
+import { updatePageElementTransformTool } from '@/tools/google_slides/update_page_element_transform'
+import { updatePageElementsZOrderTool } from '@/tools/google_slides/update_page_elements_z_order'
+import { updatePagePropertiesTool } from '@/tools/google_slides/update_page_properties'
+import { updateParagraphStyleTool } from '@/tools/google_slides/update_paragraph_style'
+import { updateShapePropertiesTool } from '@/tools/google_slides/update_shape_properties'
+import { updateSlidePropertiesTool } from '@/tools/google_slides/update_slide_properties'
 import { updateSlidesPositionTool } from '@/tools/google_slides/update_slides_position'
+import { updateTableBorderPropertiesTool } from '@/tools/google_slides/update_table_border_properties'
+import { updateTableCellPropertiesTool } from '@/tools/google_slides/update_table_cell_properties'
+import { updateTableColumnPropertiesTool } from '@/tools/google_slides/update_table_column_properties'
+import { updateTableRowPropertiesTool } from '@/tools/google_slides/update_table_row_properties'
+import { updateTextStyleTool } from '@/tools/google_slides/update_text_style'
+import { updateVideoPropertiesTool } from '@/tools/google_slides/update_video_properties'
 import { writeTool } from '@/tools/google_slides/write'
 
 export const googleSlidesReadTool = readTool
@@ -27,3 +65,50 @@ export const googleSlidesUpdateSlidesPositionTool = updateSlidesPositionTool
 export const googleSlidesCreateTableTool = createTableTool
 export const googleSlidesCreateShapeTool = createShapeTool
 export const googleSlidesInsertTextTool = insertTextTool
+
+export const googleSlidesUpdateTextStyleTool = updateTextStyleTool
+export const googleSlidesUpdateParagraphStyleTool = updateParagraphStyleTool
+export const googleSlidesDeleteTextTool = deleteTextTool
+export const googleSlidesCreateParagraphBulletsTool = createParagraphBulletsTool
+export const googleSlidesDeleteParagraphBulletsTool = deleteParagraphBulletsTool
+
+export const googleSlidesReplaceAllShapesWithImageTool = replaceAllShapesWithImageTool
+export const googleSlidesReplaceImageTool = replaceImageTool
+export const googleSlidesUpdateImagePropertiesTool = updateImagePropertiesTool
+
+export const googleSlidesUpdateShapePropertiesTool = updateShapePropertiesTool
+export const googleSlidesUpdatePagePropertiesTool = updatePagePropertiesTool
+export const googleSlidesUpdateSlidePropertiesTool = updateSlidePropertiesTool
+export const googleSlidesUpdatePageElementAltTextTool = updatePageElementAltTextTool
+
+export const googleSlidesUpdatePageElementTransformTool = updatePageElementTransformTool
+export const googleSlidesUpdatePageElementsZOrderTool = updatePageElementsZOrderTool
+export const googleSlidesGroupObjectsTool = groupObjectsTool
+export const googleSlidesUngroupObjectsTool = ungroupObjectsTool
+
+export const googleSlidesCreateLineTool = createLineTool
+export const googleSlidesUpdateLinePropertiesTool = updateLinePropertiesTool
+export const googleSlidesUpdateLineCategoryTool = updateLineCategoryTool
+export const googleSlidesRerouteLineTool = rerouteLineTool
+
+export const googleSlidesInsertTableRowsTool = insertTableRowsTool
+export const googleSlidesInsertTableColumnsTool = insertTableColumnsTool
+export const googleSlidesDeleteTableRowTool = deleteTableRowTool
+export const googleSlidesDeleteTableColumnTool = deleteTableColumnTool
+export const googleSlidesMergeTableCellsTool = mergeTableCellsTool
+export const googleSlidesUnmergeTableCellsTool = unmergeTableCellsTool
+export const googleSlidesUpdateTableCellPropertiesTool = updateTableCellPropertiesTool
+export const googleSlidesUpdateTableBorderPropertiesTool = updateTableBorderPropertiesTool
+export const googleSlidesUpdateTableColumnPropertiesTool = updateTableColumnPropertiesTool
+export const googleSlidesUpdateTableRowPropertiesTool = updateTableRowPropertiesTool
+
+export const googleSlidesCreateSheetsChartTool = createSheetsChartTool
+export const googleSlidesRefreshSheetsChartTool = refreshSheetsChartTool
+export const googleSlidesReplaceAllShapesWithSheetsChartTool = replaceAllShapesWithSheetsChartTool
+
+export const googleSlidesCreateVideoTool = createVideoTool
+export const googleSlidesUpdateVideoPropertiesTool = updateVideoPropertiesTool
+
+export const googleSlidesBatchUpdateTool = batchUpdateTool
+export const googleSlidesCopyPresentationTool = copyPresentationTool
+export const googleSlidesExportPresentationTool = exportPresentationTool
diff --git a/apps/sim/tools/google_slides/insert_table_columns.ts b/apps/sim/tools/google_slides/insert_table_columns.ts
new file mode 100644
index 00000000000..ec7b0c27fce
--- /dev/null
+++ b/apps/sim/tools/google_slides/insert_table_columns.ts
@@ -0,0 +1,139 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesInsertTableColumnsTool')
+
+interface InsertTableColumnsParams {
+  accessToken: string
+  presentationId: string
+  tableObjectId: string
+  rowIndex: number
+  columnIndex: number
+  number: number
+  insertRight?: boolean
+}
+
+interface InsertTableColumnsResponse {
+  success: boolean
+  output: {
+    inserted: boolean
+    tableObjectId: string
+    number: number
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const insertTableColumnsTool: ToolConfig<
+  InsertTableColumnsParams,
+  InsertTableColumnsResponse
+> = {
+  id: 'google_slides_insert_table_columns',
+  name: 'Insert Table Columns in Google Slides',
+  description: 'Insert one or more columns into a table, left or right of a reference cell.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    tableObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    rowIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based row index of the reference cell',
+    },
+    columnIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based column index of the reference cell',
+    },
+    number: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of columns to insert (minimum 1)',
+    },
+    insertRight: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Insert to the right of the reference column instead of left (default false)',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const tableObjectId = params.tableObjectId?.trim()
+      if (!tableObjectId) throw new Error('Table object ID is required')
+      const number = params.number
+      if (!number || number < 1) throw new Error('Number of columns must be at least 1')
+
+      return {
+        requests: [
+          {
+            insertTableColumns: {
+              tableObjectId,
+              cellLocation: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+              insertRight: params.insertRight ?? false,
+              number,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to insert table columns')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        inserted: true,
+        tableObjectId: params?.tableObjectId?.trim() || '',
+        number: params?.number ?? 0,
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    inserted: { type: 'boolean', description: 'Whether columns were inserted' },
+    tableObjectId: { type: 'string', description: 'The table updated' },
+    number: { type: 'number', description: 'Number of columns inserted' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/insert_table_rows.ts b/apps/sim/tools/google_slides/insert_table_rows.ts
new file mode 100644
index 00000000000..048e3804089
--- /dev/null
+++ b/apps/sim/tools/google_slides/insert_table_rows.ts
@@ -0,0 +1,136 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesInsertTableRowsTool')
+
+interface InsertTableRowsParams {
+  accessToken: string
+  presentationId: string
+  tableObjectId: string
+  rowIndex: number
+  columnIndex: number
+  number: number
+  insertBelow?: boolean
+}
+
+interface InsertTableRowsResponse {
+  success: boolean
+  output: {
+    inserted: boolean
+    tableObjectId: string
+    number: number
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const insertTableRowsTool: ToolConfig<InsertTableRowsParams, InsertTableRowsResponse> = {
+  id: 'google_slides_insert_table_rows',
+  name: 'Insert Table Rows in Google Slides',
+  description: 'Insert one or more rows into a table, above or below a reference cell.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    tableObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    rowIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based row index of the reference cell',
+    },
+    columnIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based column index of the reference cell',
+    },
+    number: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of rows to insert (minimum 1)',
+    },
+    insertBelow: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Insert below the reference row instead of above (default false)',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const tableObjectId = params.tableObjectId?.trim()
+      if (!tableObjectId) throw new Error('Table object ID is required')
+      const number = params.number
+      if (!number || number < 1) throw new Error('Number of rows must be at least 1')
+
+      return {
+        requests: [
+          {
+            insertTableRows: {
+              tableObjectId,
+              cellLocation: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+              insertBelow: params.insertBelow ?? false,
+              number,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to insert table rows')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        inserted: true,
+        tableObjectId: params?.tableObjectId?.trim() || '',
+        number: params?.number ?? 0,
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    inserted: { type: 'boolean', description: 'Whether rows were inserted' },
+    tableObjectId: { type: 'string', description: 'The table updated' },
+    number: { type: 'number', description: 'Number of rows inserted' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/merge_table_cells.ts b/apps/sim/tools/google_slides/merge_table_cells.ts
new file mode 100644
index 00000000000..31259196184
--- /dev/null
+++ b/apps/sim/tools/google_slides/merge_table_cells.ts
@@ -0,0 +1,137 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesMergeTableCellsTool')
+
+interface MergeTableCellsParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex: number
+  columnIndex: number
+  rowSpan: number
+  columnSpan: number
+}
+
+interface MergeTableCellsResponse {
+  success: boolean
+  output: {
+    merged: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const mergeTableCellsTool: ToolConfig<MergeTableCellsParams, MergeTableCellsResponse> = {
+  id: 'google_slides_merge_table_cells',
+  name: 'Merge Table Cells in Google Slides',
+  description:
+    'Merge a rectangular range of table cells into a single cell. The range starts at (rowIndex, columnIndex) and covers rowSpan × columnSpan cells.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    rowIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based row index of the top-left cell',
+    },
+    columnIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based column index of the top-left cell',
+    },
+    rowSpan: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of rows to merge (minimum 1)',
+    },
+    columnSpan: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of columns to merge (minimum 1)',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Table object ID is required')
+      if (!params.rowSpan || params.rowSpan < 1) throw new Error('rowSpan must be at least 1')
+      if (!params.columnSpan || params.columnSpan < 1)
+        throw new Error('columnSpan must be at least 1')
+
+      return {
+        requests: [
+          {
+            mergeTableCells: {
+              objectId,
+              tableRange: {
+                location: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+                rowSpan: params.rowSpan,
+                columnSpan: params.columnSpan,
+              },
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to merge table cells')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        merged: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    merged: { type: 'boolean', description: 'Whether the cells were merged' },
+    objectId: { type: 'string', description: 'The table updated' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/refresh_sheets_chart.ts b/apps/sim/tools/google_slides/refresh_sheets_chart.ts
new file mode 100644
index 00000000000..4b9aeb839b3
--- /dev/null
+++ b/apps/sim/tools/google_slides/refresh_sheets_chart.ts
@@ -0,0 +1,95 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesRefreshSheetsChartTool')
+
+interface RefreshSheetsChartParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+}
+
+interface RefreshSheetsChartResponse {
+  success: boolean
+  output: {
+    refreshed: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const refreshSheetsChartTool: ToolConfig<
+  RefreshSheetsChartParams,
+  RefreshSheetsChartResponse
+> = {
+  id: 'google_slides_refresh_sheets_chart',
+  name: 'Refresh Sheets Chart in Slides',
+  description:
+    'Refresh an embedded linked Sheets chart so it reflects the latest spreadsheet data.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the embedded chart to refresh',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+      return { requests: [{ refreshSheetsChart: { objectId } }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to refresh sheets chart')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        refreshed: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    refreshed: { type: 'boolean', description: 'Whether the chart was refreshed' },
+    objectId: { type: 'string', description: 'The chart object refreshed' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/replace_all_shapes_with_image.ts b/apps/sim/tools/google_slides/replace_all_shapes_with_image.ts
new file mode 100644
index 00000000000..3ce1d4059db
--- /dev/null
+++ b/apps/sim/tools/google_slides/replace_all_shapes_with_image.ts
@@ -0,0 +1,151 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesReplaceAllShapesWithImageTool')
+
+interface ReplaceAllShapesWithImageParams {
+  accessToken: string
+  presentationId: string
+  imageUrl: string
+  findText: string
+  matchCase?: boolean
+  imageReplaceMethod?: 'CENTER_INSIDE' | 'CENTER_CROP'
+  pageObjectIds?: string
+}
+
+interface ReplaceAllShapesWithImageResponse {
+  success: boolean
+  output: {
+    occurrencesChanged: number
+    metadata: { presentationId: string; url: string; imageUrl: string; findText: string }
+  }
+}
+
+export const replaceAllShapesWithImageTool: ToolConfig<
+  ReplaceAllShapesWithImageParams,
+  ReplaceAllShapesWithImageResponse
+> = {
+  id: 'google_slides_replace_all_shapes_with_image',
+  name: 'Replace All Shapes With Image in Google Slides',
+  description:
+    "Find every shape whose text matches the given token (e.g. {{cover-image}}) and replace it with an image, preserving the shape's position and bounds.",
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    imageUrl: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        "Publicly fetchable image URL (PNG, JPEG, or GIF; max 50 MB and accessible to Google's servers)",
+    },
+    findText: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Text content of shapes to replace (e.g. {{cover-image}})',
+    },
+    matchCase: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Case-sensitive match (default: true)',
+    },
+    imageReplaceMethod: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'How the image fits the shape: CENTER_INSIDE (preserve aspect, fit inside) or CENTER_CROP (fill, crop overflow). Default: CENTER_INSIDE.',
+    },
+    pageObjectIds: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated slide IDs to limit replacement to specific slides',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const imageUrl = params.imageUrl?.trim()
+      const findText = params.findText
+      if (!imageUrl) throw new Error('Image URL is required')
+      if (!findText) throw new Error('Find text is required')
+
+      const request: Record<string, unknown> = {
+        imageUrl,
+        containsText: {
+          text: findText,
+          matchCase: params.matchCase !== false,
+        },
+        imageReplaceMethod: params.imageReplaceMethod || 'CENTER_INSIDE',
+      }
+      if (params.pageObjectIds?.trim()) {
+        request.pageObjectIds = params.pageObjectIds
+          .split(',')
+          .map((id) => id.trim())
+          .filter((id) => id.length > 0)
+      }
+
+      return { requests: [{ replaceAllShapesWithImage: request }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to replace shapes with image')
+    }
+    const occurrencesChanged = data.replies?.[0]?.replaceAllShapesWithImage?.occurrencesChanged ?? 0
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        occurrencesChanged,
+        metadata: {
+          presentationId,
+          url: presentationUrl(presentationId),
+          imageUrl: params?.imageUrl?.trim() || '',
+          findText: params?.findText || '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    occurrencesChanged: {
+      type: 'number',
+      description: 'Number of shapes that were replaced with the image',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+        imageUrl: { type: 'string', description: 'The image URL inserted' },
+        findText: { type: 'string', description: 'The matched text token' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/replace_all_shapes_with_sheets_chart.ts b/apps/sim/tools/google_slides/replace_all_shapes_with_sheets_chart.ts
new file mode 100644
index 00000000000..4455fdff668
--- /dev/null
+++ b/apps/sim/tools/google_slides/replace_all_shapes_with_sheets_chart.ts
@@ -0,0 +1,164 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesReplaceAllShapesWithSheetsChartTool')
+
+interface ReplaceAllShapesWithSheetsChartParams {
+  accessToken: string
+  presentationId: string
+  spreadsheetId: string
+  chartId: number
+  findText: string
+  matchCase?: boolean
+  linkingMode?: 'LINKED' | 'NOT_LINKED_IMAGE'
+  pageObjectIds?: string
+}
+
+interface ReplaceAllShapesWithSheetsChartResponse {
+  success: boolean
+  output: {
+    occurrencesChanged: number
+    metadata: {
+      presentationId: string
+      url: string
+      findText: string
+      spreadsheetId: string
+      chartId: number
+    }
+  }
+}
+
+export const replaceAllShapesWithSheetsChartTool: ToolConfig<
+  ReplaceAllShapesWithSheetsChartParams,
+  ReplaceAllShapesWithSheetsChartResponse
+> = {
+  id: 'google_slides_replace_all_shapes_with_sheets_chart',
+  name: 'Replace All Shapes With Sheets Chart in Slides',
+  description:
+    "Find every shape matching a text token (e.g. {{revenue-chart}}) and replace each with the same embedded Sheets chart, preserving the shape's position and bounds.",
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Sheets spreadsheet ID containing the chart',
+    },
+    chartId: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Numeric chart ID within the spreadsheet',
+    },
+    findText: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Text content of shapes to replace (e.g. {{revenue-chart}})',
+    },
+    matchCase: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Case-sensitive match (default true)',
+    },
+    linkingMode: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'LINKED (default) or NOT_LINKED_IMAGE',
+    },
+    pageObjectIds: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated slide IDs to limit replacement to specific slides',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) throw new Error('Spreadsheet ID is required')
+      if (params.chartId === undefined) throw new Error('Chart ID is required')
+      const findText = params.findText
+      if (!findText) throw new Error('Find text is required')
+
+      const request: Record<string, unknown> = {
+        spreadsheetId,
+        chartId: params.chartId,
+        linkingMode: params.linkingMode || 'LINKED',
+        containsText: { text: findText, matchCase: params.matchCase !== false },
+      }
+      if (params.pageObjectIds?.trim()) {
+        request.pageObjectIds = params.pageObjectIds
+          .split(',')
+          .map((id) => id.trim())
+          .filter((id) => id.length > 0)
+      }
+
+      return { requests: [{ replaceAllShapesWithSheetsChart: request }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to replace shapes with sheets chart')
+    }
+    const occurrencesChanged =
+      data.replies?.[0]?.replaceAllShapesWithSheetsChart?.occurrencesChanged ?? 0
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        occurrencesChanged,
+        metadata: {
+          presentationId,
+          url: presentationUrl(presentationId),
+          findText: params?.findText || '',
+          spreadsheetId: params?.spreadsheetId?.trim() || '',
+          chartId: params?.chartId ?? 0,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    occurrencesChanged: {
+      type: 'number',
+      description: 'Number of shapes replaced with the chart',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+        findText: { type: 'string', description: 'The matched text token' },
+        spreadsheetId: { type: 'string', description: 'Source spreadsheet ID' },
+        chartId: { type: 'number', description: 'Source chart ID' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/replace_image.ts b/apps/sim/tools/google_slides/replace_image.ts
new file mode 100644
index 00000000000..b66d7f27654
--- /dev/null
+++ b/apps/sim/tools/google_slides/replace_image.ts
@@ -0,0 +1,125 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesReplaceImageTool')
+
+interface ReplaceImageParams {
+  accessToken: string
+  presentationId: string
+  imageObjectId: string
+  imageUrl: string
+  imageReplaceMethod?: 'CENTER_INSIDE' | 'CENTER_CROP'
+}
+
+interface ReplaceImageResponse {
+  success: boolean
+  output: {
+    replaced: boolean
+    imageObjectId: string
+    metadata: { presentationId: string; url: string; imageUrl: string }
+  }
+}
+
+export const replaceImageTool: ToolConfig<ReplaceImageParams, ReplaceImageResponse> = {
+  id: 'google_slides_replace_image',
+  name: 'Replace Image in Google Slides',
+  description:
+    "Replace the source of an existing image with a new image URL, preserving the image's position, size, and properties.",
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    imageObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the existing image to replace',
+    },
+    imageUrl: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'New publicly fetchable image URL (PNG, JPEG, or GIF, max 50 MB)',
+    },
+    imageReplaceMethod: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'CENTER_INSIDE (preserve aspect) or CENTER_CROP (fill, crop overflow). Default: CENTER_INSIDE.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const imageObjectId = params.imageObjectId?.trim()
+      const imageUrl = params.imageUrl?.trim()
+      if (!imageObjectId) throw new Error('Image object ID is required')
+      if (!imageUrl) throw new Error('Image URL is required')
+
+      return {
+        requests: [
+          {
+            replaceImage: {
+              imageObjectId,
+              url: imageUrl,
+              imageReplaceMethod: params.imageReplaceMethod || 'CENTER_INSIDE',
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to replace image')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        replaced: true,
+        imageObjectId: params?.imageObjectId?.trim() || '',
+        metadata: {
+          presentationId,
+          url: presentationUrl(presentationId),
+          imageUrl: params?.imageUrl?.trim() || '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    replaced: { type: 'boolean', description: 'Whether the image was replaced' },
+    imageObjectId: { type: 'string', description: 'The image object that was replaced' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+        imageUrl: { type: 'string', description: 'The new image URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/reroute_line.ts b/apps/sim/tools/google_slides/reroute_line.ts
new file mode 100644
index 00000000000..d9106d8917a
--- /dev/null
+++ b/apps/sim/tools/google_slides/reroute_line.ts
@@ -0,0 +1,92 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesRerouteLineTool')
+
+interface RerouteLineParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+}
+
+interface RerouteLineResponse {
+  success: boolean
+  output: {
+    rerouted: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const rerouteLineTool: ToolConfig<RerouteLineParams, RerouteLineResponse> = {
+  id: 'google_slides_reroute_line',
+  name: 'Reroute Line in Google Slides',
+  description:
+    'Reroute a connector line so it efficiently connects its endpoint shapes — useful after moving the shapes the line connects.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the connector line to reroute',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+      return { requests: [{ rerouteLine: { objectId } }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to reroute line')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        rerouted: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    rerouted: { type: 'boolean', description: 'Whether the line was rerouted' },
+    objectId: { type: 'string', description: 'The line object rerouted' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/ungroup_objects.ts b/apps/sim/tools/google_slides/ungroup_objects.ts
new file mode 100644
index 00000000000..c03d6775a05
--- /dev/null
+++ b/apps/sim/tools/google_slides/ungroup_objects.ts
@@ -0,0 +1,103 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUngroupObjectsTool')
+
+interface UngroupObjectsParams {
+  accessToken: string
+  presentationId: string
+  objectIds: string
+}
+
+interface UngroupObjectsResponse {
+  success: boolean
+  output: {
+    ungrouped: boolean
+    objectIds: string[]
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const ungroupObjectsTool: ToolConfig<UngroupObjectsParams, UngroupObjectsResponse> = {
+  id: 'google_slides_ungroup_objects',
+  name: 'Ungroup Objects in Google Slides',
+  description: 'Ungroup one or more object groups, releasing their children back to the slide.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectIds: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated object IDs of the groups to ungroup',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectIds = (params.objectIds || '')
+        .split(',')
+        .map((id) => id.trim())
+        .filter((id) => id.length > 0)
+      if (objectIds.length === 0) throw new Error('At least one group object ID is required')
+
+      return { requests: [{ ungroupObjects: { objectIds } }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to ungroup objects')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    const objectIds = (params?.objectIds || '')
+      .split(',')
+      .map((id) => id.trim())
+      .filter((id) => id.length > 0)
+    return {
+      success: true,
+      output: {
+        ungrouped: true,
+        objectIds,
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    ungrouped: { type: 'boolean', description: 'Whether the objects were ungrouped' },
+    objectIds: {
+      type: 'array',
+      description: 'Group IDs that were ungrouped',
+      items: { type: 'string' },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/unmerge_table_cells.ts b/apps/sim/tools/google_slides/unmerge_table_cells.ts
new file mode 100644
index 00000000000..af580c6e39d
--- /dev/null
+++ b/apps/sim/tools/google_slides/unmerge_table_cells.ts
@@ -0,0 +1,137 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUnmergeTableCellsTool')
+
+interface UnmergeTableCellsParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex: number
+  columnIndex: number
+  rowSpan: number
+  columnSpan: number
+}
+
+interface UnmergeTableCellsResponse {
+  success: boolean
+  output: {
+    unmerged: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const unmergeTableCellsTool: ToolConfig<UnmergeTableCellsParams, UnmergeTableCellsResponse> =
+  {
+    id: 'google_slides_unmerge_table_cells',
+    name: 'Unmerge Table Cells in Google Slides',
+    description: 'Unmerge any merged cells within the given table range.',
+    version: '1.0.0',
+
+    oauth: { required: true, provider: 'google-drive' },
+
+    params: {
+      accessToken: {
+        type: 'string',
+        required: true,
+        visibility: 'hidden',
+        description: 'The access token for the Google Slides API',
+      },
+      presentationId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Google Slides presentation ID',
+      },
+      objectId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Object ID of the table',
+      },
+      rowIndex: {
+        type: 'number',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Zero-based row index of the top-left cell of the range',
+      },
+      columnIndex: {
+        type: 'number',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Zero-based column index of the top-left cell of the range',
+      },
+      rowSpan: {
+        type: 'number',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Number of rows in the range (minimum 1)',
+      },
+      columnSpan: {
+        type: 'number',
+        required: true,
+        visibility: 'user-or-llm',
+        description: 'Number of columns in the range (minimum 1)',
+      },
+    },
+
+    request: {
+      url: (params) => batchUpdateUrl(params.presentationId),
+      method: 'POST',
+      headers: (params) => authJsonHeaders(params.accessToken),
+      body: (params) => {
+        const objectId = params.objectId?.trim()
+        if (!objectId) throw new Error('Table object ID is required')
+        if (!params.rowSpan || params.rowSpan < 1) throw new Error('rowSpan must be at least 1')
+        if (!params.columnSpan || params.columnSpan < 1)
+          throw new Error('columnSpan must be at least 1')
+
+        return {
+          requests: [
+            {
+              unmergeTableCells: {
+                objectId,
+                tableRange: {
+                  location: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+                  rowSpan: params.rowSpan,
+                  columnSpan: params.columnSpan,
+                },
+              },
+            },
+          ],
+        }
+      },
+    },
+
+    transformResponse: async (response: Response, params) => {
+      const data = await response.json()
+      if (!response.ok) {
+        logger.error('Google Slides API error:', { data })
+        throw new Error(data.error?.message || 'Failed to unmerge table cells')
+      }
+      const presentationId = params?.presentationId?.trim() || ''
+      return {
+        success: true,
+        output: {
+          unmerged: true,
+          objectId: params?.objectId?.trim() || '',
+          metadata: { presentationId, url: presentationUrl(presentationId) },
+        },
+      }
+    },
+
+    outputs: {
+      unmerged: { type: 'boolean', description: 'Whether the cells were unmerged' },
+      objectId: { type: 'string', description: 'The table updated' },
+      metadata: {
+        type: 'object',
+        description: 'Operation metadata',
+        properties: {
+          presentationId: { type: 'string', description: 'The presentation ID' },
+          url: { type: 'string', description: 'URL to the presentation' },
+        },
+      },
+    },
+  }
diff --git a/apps/sim/tools/google_slides/update_image_properties.ts b/apps/sim/tools/google_slides/update_image_properties.ts
new file mode 100644
index 00000000000..25550b51f5e
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_image_properties.ts
@@ -0,0 +1,267 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateImagePropertiesTool')
+
+interface UpdateImagePropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  brightness?: number
+  contrast?: number
+  transparency?: number
+  linkUrl?: string
+  outlineColor?: string
+  outlineWeight?: number
+  outlineDashStyle?: string
+  cropLeftOffset?: number
+  cropRightOffset?: number
+  cropTopOffset?: number
+  cropBottomOffset?: number
+  cropAngle?: number
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateImagePropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateImagePropertiesTool: ToolConfig<
+  UpdateImagePropertiesParams,
+  UpdateImagePropertiesResponse
+> = {
+  id: 'google_slides_update_image_properties',
+  name: 'Update Image Properties in Google Slides',
+  description:
+    'Update image properties — brightness, contrast, transparency, crop, outline, link — on an existing image.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the image to update',
+    },
+    brightness: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Brightness adjustment between -1.0 and 1.0',
+    },
+    contrast: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Contrast adjustment between -1.0 and 1.0',
+    },
+    transparency: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Transparency between 0.0 (opaque) and 1.0 (fully transparent)',
+    },
+    linkUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Make the image a hyperlink to this URL',
+    },
+    outlineColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline color as hex (e.g. #1A73E8)',
+    },
+    outlineWeight: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline weight in points',
+    },
+    outlineDashStyle: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline dash style: SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+    },
+    cropLeftOffset: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Crop offset from left edge (0.0 to 1.0)',
+    },
+    cropRightOffset: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Crop offset from right edge (0.0 to 1.0)',
+    },
+    cropTopOffset: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Crop offset from top edge (0.0 to 1.0)',
+    },
+    cropBottomOffset: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Crop offset from bottom edge (0.0 to 1.0)',
+    },
+    cropAngle: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Crop rotation angle in radians (clockwise)',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw ImageProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      if (params.brightness !== undefined) {
+        props.brightness = params.brightness
+        fieldList.push('brightness')
+      }
+      if (params.contrast !== undefined) {
+        props.contrast = params.contrast
+        fieldList.push('contrast')
+      }
+      if (params.transparency !== undefined) {
+        props.transparency = params.transparency
+        fieldList.push('transparency')
+      }
+      if (params.linkUrl) {
+        props.link = { url: params.linkUrl }
+        fieldList.push('link')
+      }
+      const outline: Record<string, unknown> = {}
+      const outlineColor = hexToOpaqueColor(params.outlineColor)
+      if (outlineColor) {
+        outline.outlineFill = { solidFill: { color: outlineColor } }
+      }
+      if (params.outlineWeight !== undefined) {
+        outline.weight = { magnitude: params.outlineWeight, unit: 'PT' }
+      }
+      if (params.outlineDashStyle) {
+        outline.dashStyle = params.outlineDashStyle
+      }
+      if (Object.keys(outline).length > 0) {
+        props.outline = outline
+        fieldList.push('outline')
+      }
+
+      const crop: Record<string, unknown> = {}
+      if (params.cropLeftOffset !== undefined) crop.leftOffset = params.cropLeftOffset
+      if (params.cropRightOffset !== undefined) crop.rightOffset = params.cropRightOffset
+      if (params.cropTopOffset !== undefined) crop.topOffset = params.cropTopOffset
+      if (params.cropBottomOffset !== undefined) crop.bottomOffset = params.cropBottomOffset
+      if (params.cropAngle !== undefined) crop.angle = params.cropAngle
+      if (Object.keys(crop).length > 0) {
+        props.cropProperties = crop
+        fieldList.push('cropProperties')
+      }
+
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') {
+            Object.assign(props, extra)
+          }
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [
+          {
+            updateImageProperties: { objectId, imageProperties: props, fields },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update image properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the image properties were updated' },
+    objectId: { type: 'string', description: 'The image object updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_line_category.ts b/apps/sim/tools/google_slides/update_line_category.ts
new file mode 100644
index 00000000000..59bab13bfba
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_line_category.ts
@@ -0,0 +1,115 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateLineCategoryTool')
+
+interface UpdateLineCategoryParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  lineCategory: 'STRAIGHT' | 'BENT' | 'CURVED'
+}
+
+interface UpdateLineCategoryResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    lineCategory: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateLineCategoryTool: ToolConfig<
+  UpdateLineCategoryParams,
+  UpdateLineCategoryResponse
+> = {
+  id: 'google_slides_update_line_category',
+  name: 'Update Line Category in Google Slides',
+  description: "Change a connector line's category (STRAIGHT, BENT, or CURVED).",
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the connector line',
+    },
+    lineCategory: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'New line category: STRAIGHT, BENT, or CURVED',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+      if (!params.lineCategory) throw new Error('Line category is required')
+
+      return {
+        requests: [
+          {
+            updateLineCategory: {
+              objectId,
+              lineCategory: params.lineCategory,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update line category')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        lineCategory: params?.lineCategory ?? '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the line category was updated' },
+    objectId: { type: 'string', description: 'The line object updated' },
+    lineCategory: { type: 'string', description: 'New line category' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_line_properties.ts b/apps/sim/tools/google_slides/update_line_properties.ts
new file mode 100644
index 00000000000..40196697962
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_line_properties.ts
@@ -0,0 +1,201 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateLinePropertiesTool')
+
+interface UpdateLinePropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  lineColor?: string
+  lineWeight?: number
+  dashStyle?: string
+  startArrow?: string
+  endArrow?: string
+  linkUrl?: string
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateLinePropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateLinePropertiesTool: ToolConfig<
+  UpdateLinePropertiesParams,
+  UpdateLinePropertiesResponse
+> = {
+  id: 'google_slides_update_line_properties',
+  name: 'Update Line Properties in Google Slides',
+  description: 'Update line appearance — color, weight, dash style, arrows, link.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the line',
+    },
+    lineColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Line color as hex',
+    },
+    lineWeight: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Line weight in points',
+    },
+    dashStyle: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Dash style: SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+    },
+    startArrow: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Start arrow style: NONE, STEALTH_ARROW, FILL_ARROW, FILL_CIRCLE, FILL_SQUARE, FILL_DIAMOND, OPEN_ARROW, OPEN_CIRCLE, OPEN_SQUARE, OPEN_DIAMOND',
+    },
+    endArrow: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'End arrow style (same values as startArrow)',
+    },
+    linkUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Hyperlink URL',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw LineProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      const color = hexToOpaqueColor(params.lineColor)
+      if (color) {
+        props.lineFill = { solidFill: { color } }
+        fieldList.push('lineFill')
+      }
+      if (params.lineWeight !== undefined) {
+        props.weight = { magnitude: params.lineWeight, unit: 'PT' }
+        fieldList.push('weight')
+      }
+      if (params.dashStyle) {
+        props.dashStyle = params.dashStyle
+        fieldList.push('dashStyle')
+      }
+      if (params.startArrow) {
+        props.startArrow = params.startArrow
+        fieldList.push('startArrow')
+      }
+      if (params.endArrow) {
+        props.endArrow = params.endArrow
+        fieldList.push('endArrow')
+      }
+      if (params.linkUrl) {
+        props.link = { url: params.linkUrl }
+        fieldList.push('link')
+      }
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [{ updateLineProperties: { objectId, lineProperties: props, fields } }],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update line properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the line properties were updated' },
+    objectId: { type: 'string', description: 'The line object updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_page_element_alt_text.ts b/apps/sim/tools/google_slides/update_page_element_alt_text.ts
new file mode 100644
index 00000000000..658eccbfb31
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_page_element_alt_text.ts
@@ -0,0 +1,114 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdatePageElementAltTextTool')
+
+interface UpdatePageElementAltTextParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  title?: string
+  description?: string
+}
+
+interface UpdatePageElementAltTextResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updatePageElementAltTextTool: ToolConfig<
+  UpdatePageElementAltTextParams,
+  UpdatePageElementAltTextResponse
+> = {
+  id: 'google_slides_update_page_element_alt_text',
+  name: 'Update Alt Text in Google Slides',
+  description:
+    'Set the accessibility title and/or description (alt text) of a page element such as an image, shape, or group.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the page element',
+    },
+    title: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Accessibility title for the element',
+    },
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Accessibility description (alt text) for the element',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const updateRequest: Record<string, unknown> = { objectId }
+      if (params.title !== undefined) updateRequest.title = params.title
+      if (params.description !== undefined) updateRequest.description = params.description
+
+      return { requests: [{ updatePageElementAltText: updateRequest }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update alt text')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether alt text was updated' },
+    objectId: { type: 'string', description: 'The element updated' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_page_element_transform.ts b/apps/sim/tools/google_slides/update_page_element_transform.ts
new file mode 100644
index 00000000000..68d143d7284
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_page_element_transform.ts
@@ -0,0 +1,171 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  PT_TO_EMU,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdatePageElementTransformTool')
+
+interface UpdatePageElementTransformParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  scaleX?: number
+  scaleY?: number
+  shearX?: number
+  shearY?: number
+  translateX?: number
+  translateY?: number
+  applyMode?: 'ABSOLUTE' | 'RELATIVE'
+}
+
+interface UpdatePageElementTransformResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updatePageElementTransformTool: ToolConfig<
+  UpdatePageElementTransformParams,
+  UpdatePageElementTransformResponse
+> = {
+  id: 'google_slides_update_page_element_transform',
+  name: 'Update Page Element Transform in Google Slides',
+  description:
+    'Move, resize, scale, or shear a page element. Translate is specified in points; applyMode controls whether the transform is absolute (default) or relative (multiplied with the current transform).',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the page element to transform',
+    },
+    scaleX: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Horizontal scale factor (default 1)',
+    },
+    scaleY: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Vertical scale factor (default 1)',
+    },
+    shearX: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Horizontal shear factor (default 0)',
+    },
+    shearY: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Vertical shear factor (default 0)',
+    },
+    translateX: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'X position in points (absolute) or delta (relative)',
+    },
+    translateY: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Y position in points (absolute) or delta (relative)',
+    },
+    applyMode: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'ABSOLUTE replaces the current transform; RELATIVE multiplies with it. Default ABSOLUTE.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const transform: Record<string, unknown> = {
+        unit: 'EMU',
+      }
+      transform.scaleX = params.scaleX ?? 1
+      transform.scaleY = params.scaleY ?? 1
+      if (params.shearX !== undefined) transform.shearX = params.shearX
+      if (params.shearY !== undefined) transform.shearY = params.shearY
+      if (params.translateX !== undefined) transform.translateX = params.translateX * PT_TO_EMU
+      if (params.translateY !== undefined) transform.translateY = params.translateY * PT_TO_EMU
+
+      return {
+        requests: [
+          {
+            updatePageElementTransform: {
+              objectId,
+              transform,
+              applyMode: params.applyMode || 'ABSOLUTE',
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update transform')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the transform was updated' },
+    objectId: { type: 'string', description: 'The element transformed' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_page_elements_z_order.ts b/apps/sim/tools/google_slides/update_page_elements_z_order.ts
new file mode 100644
index 00000000000..a894aeea83f
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_page_elements_z_order.ts
@@ -0,0 +1,122 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdatePageElementsZOrderTool')
+
+interface UpdatePageElementsZOrderParams {
+  accessToken: string
+  presentationId: string
+  objectIds: string
+  operation: 'BRING_TO_FRONT' | 'BRING_FORWARD' | 'SEND_BACKWARD' | 'SEND_TO_BACK'
+}
+
+interface UpdatePageElementsZOrderResponse {
+  success: boolean
+  output: {
+    reordered: boolean
+    objectIds: string[]
+    operation: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updatePageElementsZOrderTool: ToolConfig<
+  UpdatePageElementsZOrderParams,
+  UpdatePageElementsZOrderResponse
+> = {
+  id: 'google_slides_update_page_elements_z_order',
+  name: 'Update Z-Order in Google Slides',
+  description: 'Bring elements to front, send to back, or step them one layer forward/backward.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectIds: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated object IDs of the elements to reorder',
+    },
+    operation: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'BRING_TO_FRONT, BRING_FORWARD, SEND_BACKWARD, or SEND_TO_BACK',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectIds = (params.objectIds || '')
+        .split(',')
+        .map((id) => id.trim())
+        .filter((id) => id.length > 0)
+      if (objectIds.length === 0) throw new Error('At least one object ID is required')
+      if (!params.operation) throw new Error('Operation is required')
+
+      return {
+        requests: [
+          {
+            updatePageElementsZOrder: {
+              pageElementObjectIds: objectIds,
+              operation: params.operation,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update z-order')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    const objectIds = (params?.objectIds || '')
+      .split(',')
+      .map((id) => id.trim())
+      .filter((id) => id.length > 0)
+    return {
+      success: true,
+      output: {
+        reordered: true,
+        objectIds,
+        operation: params?.operation ?? '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    reordered: { type: 'boolean', description: 'Whether the z-order was changed' },
+    objectIds: { type: 'array', description: 'Elements reordered', items: { type: 'string' } },
+    operation: { type: 'string', description: 'Operation applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_page_properties.ts b/apps/sim/tools/google_slides/update_page_properties.ts
new file mode 100644
index 00000000000..b963a9ddc63
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_page_properties.ts
@@ -0,0 +1,185 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdatePagePropertiesTool')
+
+interface UpdatePagePropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  backgroundColor?: string
+  backgroundAlpha?: number
+  backgroundImageUrl?: string
+  backgroundUnset?: boolean
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdatePagePropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updatePagePropertiesTool: ToolConfig<
+  UpdatePagePropertiesParams,
+  UpdatePagePropertiesResponse
+> = {
+  id: 'google_slides_update_page_properties',
+  name: 'Update Page Properties in Google Slides',
+  description:
+    'Update slide/page background — solid color or stretched picture — and other page properties.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the slide/page to update',
+    },
+    backgroundColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Solid background color as hex (e.g. #0B1F3A)',
+    },
+    backgroundAlpha: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Background fill opacity between 0.0 and 1.0',
+    },
+    backgroundImageUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Publicly fetchable image URL to use as a stretched picture background',
+    },
+    backgroundUnset: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When true, removes the background so the slide inherits its layout background',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw PageProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      if (params.backgroundUnset) {
+        props.pageBackgroundFill = { propertyState: 'NOT_RENDERED' }
+        fieldList.push('pageBackgroundFill.propertyState')
+      } else if (params.backgroundImageUrl?.trim()) {
+        props.pageBackgroundFill = {
+          stretchedPictureFill: { contentUrl: params.backgroundImageUrl.trim() },
+          propertyState: 'RENDERED',
+        }
+        fieldList.push('pageBackgroundFill')
+      } else {
+        const bg = hexToOpaqueColor(params.backgroundColor)
+        if (bg) {
+          props.pageBackgroundFill = {
+            solidFill: {
+              color: bg,
+              ...(params.backgroundAlpha !== undefined ? { alpha: params.backgroundAlpha } : {}),
+            },
+            propertyState: 'RENDERED',
+          }
+          fieldList.push('pageBackgroundFill')
+        }
+      }
+
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [{ updatePageProperties: { objectId, pageProperties: props, fields } }],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update page properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the page properties were updated' },
+    objectId: { type: 'string', description: 'The page object updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_paragraph_style.ts b/apps/sim/tools/google_slides/update_paragraph_style.ts
new file mode 100644
index 00000000000..349c3535f84
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_paragraph_style.ts
@@ -0,0 +1,288 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildCellLocation,
+  buildTextRange,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateParagraphStyleTool')
+
+interface UpdateParagraphStyleParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex?: number
+  columnIndex?: number
+  rangeType?: 'ALL' | 'FROM_START_INDEX' | 'FIXED_RANGE'
+  startIndex?: number
+  endIndex?: number
+  alignment?: 'START' | 'CENTER' | 'END' | 'JUSTIFIED'
+  lineSpacing?: number
+  indentStart?: number
+  indentEnd?: number
+  indentFirstLine?: number
+  spaceAbove?: number
+  spaceBelow?: number
+  direction?: 'LEFT_TO_RIGHT' | 'RIGHT_TO_LEFT'
+  spacingMode?: 'NEVER_COLLAPSE' | 'COLLAPSE_LISTS'
+  styleJson?: string
+  fields?: string
+}
+
+interface UpdateParagraphStyleResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateParagraphStyleTool: ToolConfig<
+  UpdateParagraphStyleParams,
+  UpdateParagraphStyleResponse
+> = {
+  id: 'google_slides_update_paragraph_style',
+  name: 'Update Paragraph Style in Google Slides',
+  description:
+    'Update paragraph styling — alignment, line spacing, indents, space above/below — for text in a shape or table cell.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the shape or table containing the text',
+    },
+    rowIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based row index',
+    },
+    columnIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based column index',
+    },
+    rangeType: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Range to style: ALL (default), FROM_START_INDEX, or FIXED_RANGE',
+    },
+    startIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Start index for FROM_START_INDEX or FIXED_RANGE',
+    },
+    endIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'End index for FIXED_RANGE',
+    },
+    alignment: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Text alignment: START, CENTER, END, or JUSTIFIED',
+    },
+    lineSpacing: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Line spacing as a percentage (100 = single, 200 = double)',
+    },
+    indentStart: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Start-edge indent in points',
+    },
+    indentEnd: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'End-edge indent in points',
+    },
+    indentFirstLine: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'First-line indent in points',
+    },
+    spaceAbove: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Space above the paragraph in points',
+    },
+    spaceBelow: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Space below the paragraph in points',
+    },
+    direction: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Text direction: LEFT_TO_RIGHT or RIGHT_TO_LEFT',
+    },
+    spacingMode: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Spacing mode: NEVER_COLLAPSE or COLLAPSE_LISTS',
+    },
+    styleJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw ParagraphStyle JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const style: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      const ptDim = (pt: number) => ({ magnitude: pt, unit: 'PT' })
+
+      if (params.alignment) {
+        style.alignment = params.alignment
+        fieldList.push('alignment')
+      }
+      if (params.lineSpacing !== undefined) {
+        style.lineSpacing = params.lineSpacing
+        fieldList.push('lineSpacing')
+      }
+      if (params.indentStart !== undefined) {
+        style.indentStart = ptDim(params.indentStart)
+        fieldList.push('indentStart')
+      }
+      if (params.indentEnd !== undefined) {
+        style.indentEnd = ptDim(params.indentEnd)
+        fieldList.push('indentEnd')
+      }
+      if (params.indentFirstLine !== undefined) {
+        style.indentFirstLine = ptDim(params.indentFirstLine)
+        fieldList.push('indentFirstLine')
+      }
+      if (params.spaceAbove !== undefined) {
+        style.spaceAbove = ptDim(params.spaceAbove)
+        fieldList.push('spaceAbove')
+      }
+      if (params.spaceBelow !== undefined) {
+        style.spaceBelow = ptDim(params.spaceBelow)
+        fieldList.push('spaceBelow')
+      }
+      if (params.direction) {
+        style.direction = params.direction
+        fieldList.push('direction')
+      }
+      if (params.spacingMode) {
+        style.spacingMode = params.spacingMode
+        fieldList.push('spacingMode')
+      }
+
+      if (params.styleJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.styleJson)
+          if (extra && typeof extra === 'object') {
+            Object.assign(style, extra)
+          }
+        } catch (e) {
+          logger.warn('Invalid styleJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      const updateRequest: Record<string, unknown> = {
+        objectId,
+        style,
+        textRange: buildTextRange({
+          rangeType: params.rangeType,
+          startIndex: params.startIndex,
+          endIndex: params.endIndex,
+        }),
+        fields,
+      }
+      const cellLocation = buildCellLocation({
+        rowIndex: params.rowIndex,
+        columnIndex: params.columnIndex,
+      })
+      if (cellLocation) updateRequest.cellLocation = cellLocation
+
+      return { requests: [{ updateParagraphStyle: updateRequest }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update paragraph style')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the paragraph style was updated' },
+    objectId: { type: 'string', description: 'The object whose paragraph was styled' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_shape_properties.ts b/apps/sim/tools/google_slides/update_shape_properties.ts
new file mode 100644
index 00000000000..1b42d449a49
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_shape_properties.ts
@@ -0,0 +1,246 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateShapePropertiesTool')
+
+interface UpdateShapePropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  fillColor?: string
+  fillAlpha?: number
+  fillUnset?: boolean
+  outlineColor?: string
+  outlineWeight?: number
+  outlineDashStyle?: string
+  outlineUnset?: boolean
+  linkUrl?: string
+  contentAlignment?: 'TOP' | 'MIDDLE' | 'BOTTOM'
+  autofitType?: 'NONE' | 'TEXT_AUTOFIT' | 'SHAPE_AUTOFIT'
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateShapePropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateShapePropertiesTool: ToolConfig<
+  UpdateShapePropertiesParams,
+  UpdateShapePropertiesResponse
+> = {
+  id: 'google_slides_update_shape_properties',
+  name: 'Update Shape Properties in Google Slides',
+  description:
+    "Update a shape's appearance — background fill color, outline, link, content alignment, autofit. Pass only the properties you want to change.",
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the shape to update',
+    },
+    fillColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Solid background fill color as hex (e.g. #FF6F61)',
+    },
+    fillAlpha: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Fill opacity between 0.0 (transparent) and 1.0 (opaque)',
+    },
+    fillUnset: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When true, removes any fill so the shape inherits its layout/master fill',
+    },
+    outlineColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline color as hex',
+    },
+    outlineWeight: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline weight in points',
+    },
+    outlineDashStyle: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline dash style: SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+    },
+    outlineUnset: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When true, removes any outline so the shape inherits its layout/master outline',
+    },
+    linkUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Make the shape a hyperlink to this URL',
+    },
+    contentAlignment: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Vertical alignment of shape contents: TOP, MIDDLE, or BOTTOM',
+    },
+    autofitType: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Autofit behavior: NONE, TEXT_AUTOFIT, or SHAPE_AUTOFIT',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw ShapeProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      const fill = hexToOpaqueColor(params.fillColor)
+      if (params.fillUnset) {
+        props.shapeBackgroundFill = { propertyState: 'NOT_RENDERED' }
+        fieldList.push('shapeBackgroundFill.propertyState')
+      } else if (fill) {
+        props.shapeBackgroundFill = {
+          solidFill: {
+            color: fill,
+            ...(params.fillAlpha !== undefined ? { alpha: params.fillAlpha } : {}),
+          },
+          propertyState: 'RENDERED',
+        }
+        fieldList.push('shapeBackgroundFill')
+      }
+
+      const outlineColor = hexToOpaqueColor(params.outlineColor)
+      if (params.outlineUnset) {
+        props.outline = { propertyState: 'NOT_RENDERED' }
+        fieldList.push('outline.propertyState')
+      } else if (outlineColor || params.outlineWeight !== undefined || params.outlineDashStyle) {
+        const outline: Record<string, unknown> = { propertyState: 'RENDERED' }
+        if (outlineColor) outline.outlineFill = { solidFill: { color: outlineColor } }
+        if (params.outlineWeight !== undefined)
+          outline.weight = { magnitude: params.outlineWeight, unit: 'PT' }
+        if (params.outlineDashStyle) outline.dashStyle = params.outlineDashStyle
+        props.outline = outline
+        fieldList.push('outline')
+      }
+
+      if (params.linkUrl) {
+        props.link = { url: params.linkUrl }
+        fieldList.push('link')
+      }
+      if (params.contentAlignment) {
+        props.contentAlignment = params.contentAlignment
+        fieldList.push('contentAlignment')
+      }
+      if (params.autofitType) {
+        props.autofit = { autofitType: params.autofitType }
+        fieldList.push('autofit.autofitType')
+      }
+
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [{ updateShapeProperties: { objectId, shapeProperties: props, fields } }],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update shape properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the shape properties were updated' },
+    objectId: { type: 'string', description: 'The shape object updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_slide_properties.ts b/apps/sim/tools/google_slides/update_slide_properties.ts
new file mode 100644
index 00000000000..b9a9e5111c4
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_slide_properties.ts
@@ -0,0 +1,140 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateSlidePropertiesTool')
+
+interface UpdateSlidePropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  isSkipped?: boolean
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateSlidePropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateSlidePropertiesTool: ToolConfig<
+  UpdateSlidePropertiesParams,
+  UpdateSlidePropertiesResponse
+> = {
+  id: 'google_slides_update_slide_properties',
+  name: 'Update Slide Properties in Google Slides',
+  description:
+    'Update slide-specific properties such as whether the slide is skipped during presentation.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the slide to update',
+    },
+    isSkipped: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the slide is skipped in presentation mode',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw SlideProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      if (params.isSkipped !== undefined) {
+        props.isSkipped = params.isSkipped
+        fieldList.push('isSkipped')
+      }
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [{ updateSlideProperties: { objectId, slideProperties: props, fields } }],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update slide properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the slide properties were updated' },
+    objectId: { type: 'string', description: 'The slide object updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_table_border_properties.ts b/apps/sim/tools/google_slides/update_table_border_properties.ts
new file mode 100644
index 00000000000..e401d6836cf
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_table_border_properties.ts
@@ -0,0 +1,227 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateTableBorderPropertiesTool')
+
+interface UpdateTableBorderPropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex: number
+  columnIndex: number
+  rowSpan: number
+  columnSpan: number
+  borderPosition?:
+    | 'ALL'
+    | 'BOTTOM'
+    | 'INNER'
+    | 'INNER_HORIZONTAL'
+    | 'INNER_VERTICAL'
+    | 'LEFT'
+    | 'OUTER'
+    | 'RIGHT'
+    | 'TOP'
+  borderColor?: string
+  borderWeight?: number
+  dashStyle?: string
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateTableBorderPropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateTableBorderPropertiesTool: ToolConfig<
+  UpdateTableBorderPropertiesParams,
+  UpdateTableBorderPropertiesResponse
+> = {
+  id: 'google_slides_update_table_border_properties',
+  name: 'Update Table Border Properties in Google Slides',
+  description:
+    'Update border color, weight, and dash style for a position (e.g. ALL, INNER, OUTER) in a table range.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    rowIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based row index of the top-left cell of the range',
+    },
+    columnIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based column index of the top-left cell of the range',
+    },
+    rowSpan: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of rows in the range (minimum 1)',
+    },
+    columnSpan: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of columns in the range (minimum 1)',
+    },
+    borderPosition: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Which borders to update: ALL (default), BOTTOM, INNER, INNER_HORIZONTAL, INNER_VERTICAL, LEFT, OUTER, RIGHT, TOP',
+    },
+    borderColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Border color as hex',
+    },
+    borderWeight: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Border weight in points',
+    },
+    dashStyle: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Dash style: SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw TableBorderProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Table object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      const color = hexToOpaqueColor(params.borderColor)
+      if (color) {
+        props.tableBorderFill = { solidFill: { color } }
+        fieldList.push('tableBorderFill')
+      }
+      if (params.borderWeight !== undefined) {
+        props.weight = { magnitude: params.borderWeight, unit: 'PT' }
+        fieldList.push('weight')
+      }
+      if (params.dashStyle) {
+        props.dashStyle = params.dashStyle
+        fieldList.push('dashStyle')
+      }
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [
+          {
+            updateTableBorderProperties: {
+              objectId,
+              tableRange: {
+                location: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+                rowSpan: params.rowSpan,
+                columnSpan: params.columnSpan,
+              },
+              borderPosition: params.borderPosition || 'ALL',
+              tableBorderProperties: props,
+              fields,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update table border properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the border properties were updated' },
+    objectId: { type: 'string', description: 'The table updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_table_cell_properties.ts b/apps/sim/tools/google_slides/update_table_cell_properties.ts
new file mode 100644
index 00000000000..1bdc2520b0e
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_table_cell_properties.ts
@@ -0,0 +1,210 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateTableCellPropertiesTool')
+
+interface UpdateTableCellPropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex: number
+  columnIndex: number
+  rowSpan: number
+  columnSpan: number
+  backgroundColor?: string
+  backgroundAlpha?: number
+  contentAlignment?: 'TOP' | 'MIDDLE' | 'BOTTOM'
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateTableCellPropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateTableCellPropertiesTool: ToolConfig<
+  UpdateTableCellPropertiesParams,
+  UpdateTableCellPropertiesResponse
+> = {
+  id: 'google_slides_update_table_cell_properties',
+  name: 'Update Table Cell Properties in Google Slides',
+  description: 'Update background fill and content alignment for a range of table cells.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    rowIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based row index of the top-left cell of the range',
+    },
+    columnIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Zero-based column index of the top-left cell of the range',
+    },
+    rowSpan: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of rows in the range (minimum 1)',
+    },
+    columnSpan: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of columns in the range (minimum 1)',
+    },
+    backgroundColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Cell background color as hex (e.g. #F1F3F4)',
+    },
+    backgroundAlpha: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Background fill opacity between 0.0 and 1.0',
+    },
+    contentAlignment: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Vertical alignment of cell content: TOP, MIDDLE, or BOTTOM',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw TableCellProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Table object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      const bg = hexToOpaqueColor(params.backgroundColor)
+      if (bg) {
+        props.tableCellBackgroundFill = {
+          solidFill: {
+            color: bg,
+            ...(params.backgroundAlpha !== undefined ? { alpha: params.backgroundAlpha } : {}),
+          },
+          propertyState: 'RENDERED',
+        }
+        fieldList.push('tableCellBackgroundFill')
+      }
+      if (params.contentAlignment) {
+        props.contentAlignment = params.contentAlignment
+        fieldList.push('contentAlignment')
+      }
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [
+          {
+            updateTableCellProperties: {
+              objectId,
+              tableRange: {
+                location: { rowIndex: params.rowIndex, columnIndex: params.columnIndex },
+                rowSpan: params.rowSpan,
+                columnSpan: params.columnSpan,
+              },
+              tableCellProperties: props,
+              fields,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update table cell properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the cell properties were updated' },
+    objectId: { type: 'string', description: 'The table updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_table_column_properties.ts b/apps/sim/tools/google_slides/update_table_column_properties.ts
new file mode 100644
index 00000000000..bb63f24980c
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_table_column_properties.ts
@@ -0,0 +1,158 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateTableColumnPropertiesTool')
+
+interface UpdateTableColumnPropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  columnIndices: string
+  columnWidth?: number
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateTableColumnPropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateTableColumnPropertiesTool: ToolConfig<
+  UpdateTableColumnPropertiesParams,
+  UpdateTableColumnPropertiesResponse
+> = {
+  id: 'google_slides_update_table_column_properties',
+  name: 'Update Table Column Properties in Google Slides',
+  description: 'Update column widths and other column-level table properties.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    columnIndices: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated zero-based column indices to update (e.g. "0,2,3")',
+    },
+    columnWidth: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Column width in points',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw TableColumnProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Table object ID is required')
+      const columnIndices = (params.columnIndices || '')
+        .split(',')
+        .map((s) => Number.parseInt(s.trim(), 10))
+        .filter((n) => Number.isFinite(n) && n >= 0)
+      if (columnIndices.length === 0) throw new Error('At least one column index is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+      if (params.columnWidth !== undefined) {
+        props.columnWidth = { magnitude: params.columnWidth, unit: 'PT' }
+        fieldList.push('columnWidth')
+      }
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [
+          {
+            updateTableColumnProperties: {
+              objectId,
+              columnIndices,
+              tableColumnProperties: props,
+              fields,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update table column properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the column properties were updated' },
+    objectId: { type: 'string', description: 'The table updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_table_row_properties.ts b/apps/sim/tools/google_slides/update_table_row_properties.ts
new file mode 100644
index 00000000000..8a60deb9f40
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_table_row_properties.ts
@@ -0,0 +1,158 @@
+import { createLogger } from '@sim/logger'
+import { authJsonHeaders, batchUpdateUrl, presentationUrl } from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateTableRowPropertiesTool')
+
+interface UpdateTableRowPropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndices: string
+  minRowHeight?: number
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateTableRowPropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateTableRowPropertiesTool: ToolConfig<
+  UpdateTableRowPropertiesParams,
+  UpdateTableRowPropertiesResponse
+> = {
+  id: 'google_slides_update_table_row_properties',
+  name: 'Update Table Row Properties in Google Slides',
+  description: 'Update minimum row heights and other row-level table properties.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the table',
+    },
+    rowIndices: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated zero-based row indices to update (e.g. "0,2,3")',
+    },
+    minRowHeight: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Minimum row height in points',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw TableRowProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Table object ID is required')
+      const rowIndices = (params.rowIndices || '')
+        .split(',')
+        .map((s) => Number.parseInt(s.trim(), 10))
+        .filter((n) => Number.isFinite(n) && n >= 0)
+      if (rowIndices.length === 0) throw new Error('At least one row index is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+      if (params.minRowHeight !== undefined) {
+        props.minRowHeight = { magnitude: params.minRowHeight, unit: 'PT' }
+        fieldList.push('minRowHeight')
+      }
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [
+          {
+            updateTableRowProperties: {
+              objectId,
+              rowIndices,
+              tableRowProperties: props,
+              fields,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update table row properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the row properties were updated' },
+    objectId: { type: 'string', description: 'The table updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_text_style.ts b/apps/sim/tools/google_slides/update_text_style.ts
new file mode 100644
index 00000000000..4ebb8dee746
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_text_style.ts
@@ -0,0 +1,311 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  buildCellLocation,
+  buildTextRange,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateTextStyleTool')
+
+interface UpdateTextStyleParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  rowIndex?: number
+  columnIndex?: number
+  rangeType?: 'ALL' | 'FROM_START_INDEX' | 'FIXED_RANGE'
+  startIndex?: number
+  endIndex?: number
+  bold?: boolean
+  italic?: boolean
+  underline?: boolean
+  strikethrough?: boolean
+  smallCaps?: boolean
+  fontFamily?: string
+  fontSize?: number
+  foregroundColor?: string
+  backgroundColor?: string
+  linkUrl?: string
+  baselineOffset?: 'NONE' | 'SUPERSCRIPT' | 'SUBSCRIPT'
+  styleJson?: string
+  fields?: string
+}
+
+interface UpdateTextStyleResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateTextStyleTool: ToolConfig<UpdateTextStyleParams, UpdateTextStyleResponse> = {
+  id: 'google_slides_update_text_style',
+  name: 'Update Text Style in Google Slides',
+  description:
+    'Update the styling of text in a shape or table cell (bold, italic, font family, font size, foreground/background color, link, etc.). Only the fields you set are applied.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the shape or table containing the text',
+    },
+    rowIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based row index',
+    },
+    columnIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When targeting a table cell, the zero-based column index',
+    },
+    rangeType: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Range to style: ALL (default), FROM_START_INDEX, or FIXED_RANGE',
+    },
+    startIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Start index for FROM_START_INDEX or FIXED_RANGE',
+    },
+    endIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'End index for FIXED_RANGE',
+    },
+    bold: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the text is bold',
+    },
+    italic: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the text is italic',
+    },
+    underline: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the text is underlined',
+    },
+    strikethrough: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the text has strikethrough',
+    },
+    smallCaps: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the text is rendered in small caps',
+    },
+    fontFamily: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Font family name (must be a font available to Google Slides)',
+    },
+    fontSize: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Font size in points',
+    },
+    foregroundColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Text color as hex (e.g. #1A73E8)',
+    },
+    backgroundColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Text background color as hex (e.g. #FFF8E1)',
+    },
+    linkUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Convert the range to a hyperlink with this URL',
+    },
+    baselineOffset: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Baseline offset: NONE, SUPERSCRIPT, or SUBSCRIPT',
+    },
+    styleJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Advanced: raw TextStyle JSON merged with the simple fields above (overrides them on conflict)',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Advanced: explicit FieldMask. If omitted, the mask is computed from the fields you provided (or "*" when styleJson is used without explicit fields).',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const style: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      if (params.bold !== undefined) {
+        style.bold = params.bold
+        fieldList.push('bold')
+      }
+      if (params.italic !== undefined) {
+        style.italic = params.italic
+        fieldList.push('italic')
+      }
+      if (params.underline !== undefined) {
+        style.underline = params.underline
+        fieldList.push('underline')
+      }
+      if (params.strikethrough !== undefined) {
+        style.strikethrough = params.strikethrough
+        fieldList.push('strikethrough')
+      }
+      if (params.smallCaps !== undefined) {
+        style.smallCaps = params.smallCaps
+        fieldList.push('smallCaps')
+      }
+      if (params.fontFamily) {
+        style.fontFamily = params.fontFamily
+        fieldList.push('fontFamily')
+      }
+      if (params.fontSize !== undefined) {
+        style.fontSize = { magnitude: params.fontSize, unit: 'PT' }
+        fieldList.push('fontSize')
+      }
+      const fg = hexToOpaqueColor(params.foregroundColor)
+      if (fg) {
+        style.foregroundColor = { opaqueColor: fg }
+        fieldList.push('foregroundColor')
+      }
+      const bg = hexToOpaqueColor(params.backgroundColor)
+      if (bg) {
+        style.backgroundColor = { opaqueColor: bg }
+        fieldList.push('backgroundColor')
+      }
+      if (params.linkUrl) {
+        style.link = { url: params.linkUrl }
+        fieldList.push('link')
+      }
+      if (params.baselineOffset) {
+        style.baselineOffset = params.baselineOffset
+        fieldList.push('baselineOffset')
+      }
+
+      if (params.styleJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.styleJson)
+          if (extra && typeof extra === 'object') {
+            Object.assign(style, extra)
+          }
+        } catch (e) {
+          logger.warn('Invalid styleJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      const updateRequest: Record<string, unknown> = {
+        objectId,
+        style,
+        textRange: buildTextRange({
+          rangeType: params.rangeType,
+          startIndex: params.startIndex,
+          endIndex: params.endIndex,
+        }),
+        fields,
+      }
+
+      const cellLocation = buildCellLocation({
+        rowIndex: params.rowIndex,
+        columnIndex: params.columnIndex,
+      })
+      if (cellLocation) updateRequest.cellLocation = cellLocation
+
+      return { requests: [{ updateTextStyle: updateRequest }] }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update text style')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the text style was updated' },
+    objectId: { type: 'string', description: 'The object whose text was styled' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/update_video_properties.ts b/apps/sim/tools/google_slides/update_video_properties.ts
new file mode 100644
index 00000000000..5873499244f
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_video_properties.ts
@@ -0,0 +1,208 @@
+import { createLogger } from '@sim/logger'
+import {
+  authJsonHeaders,
+  batchUpdateUrl,
+  hexToOpaqueColor,
+  presentationUrl,
+} from '@/tools/google_slides/utils'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateVideoPropertiesTool')
+
+interface UpdateVideoPropertiesParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  autoPlay?: boolean
+  mute?: boolean
+  start?: number
+  end?: number
+  outlineColor?: string
+  outlineWeight?: number
+  outlineDashStyle?: string
+  propertiesJson?: string
+  fields?: string
+}
+
+interface UpdateVideoPropertiesResponse {
+  success: boolean
+  output: {
+    updated: boolean
+    objectId: string
+    fields: string
+    metadata: { presentationId: string; url: string }
+  }
+}
+
+export const updateVideoPropertiesTool: ToolConfig<
+  UpdateVideoPropertiesParams,
+  UpdateVideoPropertiesResponse
+> = {
+  id: 'google_slides_update_video_properties',
+  name: 'Update Video Properties in Google Slides',
+  description: 'Update video playback options (autoPlay, mute, start/end) and outline.',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: 'google-drive' },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Google Slides presentation ID',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Object ID of the video',
+    },
+    autoPlay: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Play the video automatically when the slide is shown',
+    },
+    mute: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Mute the video',
+    },
+    start: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Playback start time in seconds',
+    },
+    end: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Playback end time in seconds',
+    },
+    outlineColor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline color as hex',
+    },
+    outlineWeight: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline weight in points',
+    },
+    outlineDashStyle: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Outline dash style',
+    },
+    propertiesJson: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: raw VideoProperties JSON merged with the simple fields above',
+    },
+    fields: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Advanced: explicit FieldMask. If omitted, computed from provided fields.',
+    },
+  },
+
+  request: {
+    url: (params) => batchUpdateUrl(params.presentationId),
+    method: 'POST',
+    headers: (params) => authJsonHeaders(params.accessToken),
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) throw new Error('Object ID is required')
+
+      const props: Record<string, unknown> = {}
+      const fieldList: string[] = []
+
+      if (params.autoPlay !== undefined) {
+        props.autoPlay = params.autoPlay
+        fieldList.push('autoPlay')
+      }
+      if (params.mute !== undefined) {
+        props.mute = params.mute
+        fieldList.push('mute')
+      }
+      if (params.start !== undefined) {
+        props.start = params.start
+        fieldList.push('start')
+      }
+      if (params.end !== undefined) {
+        props.end = params.end
+        fieldList.push('end')
+      }
+      const outlineColor = hexToOpaqueColor(params.outlineColor)
+      if (outlineColor || params.outlineWeight !== undefined || params.outlineDashStyle) {
+        const outline: Record<string, unknown> = { propertyState: 'RENDERED' }
+        if (outlineColor) outline.outlineFill = { solidFill: { color: outlineColor } }
+        if (params.outlineWeight !== undefined)
+          outline.weight = { magnitude: params.outlineWeight, unit: 'PT' }
+        if (params.outlineDashStyle) outline.dashStyle = params.outlineDashStyle
+        props.outline = outline
+        fieldList.push('outline')
+      }
+      if (params.propertiesJson?.trim()) {
+        try {
+          const extra = JSON.parse(params.propertiesJson)
+          if (extra && typeof extra === 'object') Object.assign(props, extra)
+        } catch (e) {
+          logger.warn('Invalid propertiesJson, ignoring:', { error: e })
+        }
+      }
+
+      const fields = params.fields?.trim() || (fieldList.length > 0 ? fieldList.join(',') : '*')
+
+      return {
+        requests: [{ updateVideoProperties: { objectId, videoProperties: props, fields } }],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update video properties')
+    }
+    const presentationId = params?.presentationId?.trim() || ''
+    return {
+      success: true,
+      output: {
+        updated: true,
+        objectId: params?.objectId?.trim() || '',
+        fields: params?.fields?.trim() || '',
+        metadata: { presentationId, url: presentationUrl(presentationId) },
+      },
+    }
+  },
+
+  outputs: {
+    updated: { type: 'boolean', description: 'Whether the video properties were updated' },
+    objectId: { type: 'string', description: 'The video object updated' },
+    fields: { type: 'string', description: 'FieldMask applied' },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/utils.ts b/apps/sim/tools/google_slides/utils.ts
new file mode 100644
index 00000000000..011c4939530
--- /dev/null
+++ b/apps/sim/tools/google_slides/utils.ts
@@ -0,0 +1,136 @@
+import { generateRandomString } from '@sim/utils/random'
+
+/** 1 point = 12700 EMU (English Metric Units). */
+export const PT_TO_EMU = 12700
+
+export interface OpaqueColor {
+  rgbColor: { red: number; green: number; blue: number }
+}
+
+export interface TextRangeInput {
+  rangeType?: 'ALL' | 'FROM_START_INDEX' | 'FIXED_RANGE'
+  startIndex?: number
+  endIndex?: number
+}
+
+export interface CellLocationInput {
+  rowIndex?: number
+  columnIndex?: number
+}
+
+/**
+ * Convert a hex color string (`#RRGGBB`, `#RGB`, or bare hex) into the
+ * Google Slides API's OpaqueColor shape with rgbColor scaled 0-1.
+ * Returns null when input is empty/invalid.
+ */
+export function hexToOpaqueColor(input?: string | null): OpaqueColor | null {
+  if (!input) return null
+  let hex = input.trim().replace(/^#/, '')
+  if (hex.length === 3) {
+    hex = hex
+      .split('')
+      .map((c) => c + c)
+      .join('')
+  }
+  if (!/^[0-9a-fA-F]{6}$/.test(hex)) return null
+  const r = Number.parseInt(hex.slice(0, 2), 16)
+  const g = Number.parseInt(hex.slice(2, 4), 16)
+  const b = Number.parseInt(hex.slice(4, 6), 16)
+  return {
+    rgbColor: {
+      red: r / 255,
+      green: g / 255,
+      blue: b / 255,
+    },
+  }
+}
+
+/**
+ * Build a Slides API TextRange. Defaults to range type ALL.
+ * `FROM_START_INDEX` requires startIndex; `FIXED_RANGE` requires both indices.
+ */
+export function buildTextRange(input: TextRangeInput | undefined) {
+  const rangeType = input?.rangeType ?? 'ALL'
+  if (rangeType === 'FROM_START_INDEX') {
+    return { type: 'FROM_START_INDEX', startIndex: input?.startIndex ?? 0 }
+  }
+  if (rangeType === 'FIXED_RANGE') {
+    return {
+      type: 'FIXED_RANGE',
+      startIndex: input?.startIndex ?? 0,
+      endIndex: input?.endIndex ?? 0,
+    }
+  }
+  return { type: 'ALL' }
+}
+
+/**
+ * Build an optional cellLocation if both row and column indices are provided.
+ * Slides API treats absence as targeting the shape itself (not a table cell).
+ */
+export function buildCellLocation(input: CellLocationInput | undefined) {
+  if (input?.rowIndex === undefined || input?.columnIndex === undefined) return undefined
+  return { rowIndex: input.rowIndex, columnIndex: input.columnIndex }
+}
+
+/** Generate a stable-enough object ID prefixed by kind. */
+export function generateObjectId(kind: string): string {
+  return `${kind}_${Date.now()}_${generateRandomString(7)}`
+}
+
+/** Convert a points value (or undefined) to an EMU Dimension object. */
+export function ptToEmuDimension(pt: number | undefined, fallbackPt: number) {
+  return {
+    magnitude: (pt ?? fallbackPt) * PT_TO_EMU,
+    unit: 'EMU',
+  }
+}
+
+/** Build a standard PageElementProperties with size + transform from points. */
+export function buildElementProperties(opts: {
+  pageObjectId: string
+  width?: number
+  height?: number
+  positionX?: number
+  positionY?: number
+  defaultWidth?: number
+  defaultHeight?: number
+  defaultX?: number
+  defaultY?: number
+}) {
+  return {
+    pageObjectId: opts.pageObjectId,
+    size: {
+      width: ptToEmuDimension(opts.width, opts.defaultWidth ?? 200),
+      height: ptToEmuDimension(opts.height, opts.defaultHeight ?? 100),
+    },
+    transform: {
+      scaleX: 1,
+      scaleY: 1,
+      translateX: (opts.positionX ?? opts.defaultX ?? 100) * PT_TO_EMU,
+      translateY: (opts.positionY ?? opts.defaultY ?? 100) * PT_TO_EMU,
+      unit: 'EMU',
+    },
+  }
+}
+
+/** Standard presentation URL for embedding in metadata. */
+export function presentationUrl(presentationId: string): string {
+  return `https://docs.google.com/presentation/d/${presentationId}/edit`
+}
+
+/** Standard fetch headers for Slides API JSON calls. */
+export function authJsonHeaders(accessToken: string) {
+  if (!accessToken) throw new Error('Access token is required')
+  return {
+    Authorization: `Bearer ${accessToken}`,
+    'Content-Type': 'application/json',
+  }
+}
+
+/** Resolve the batchUpdate URL for a given presentation. */
+export function batchUpdateUrl(presentationId: string | undefined): string {
+  const id = presentationId?.trim()
+  if (!id) throw new Error('Presentation ID is required')
+  return `https://slides.googleapis.com/v1/presentations/${id}:batchUpdate`
+}
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index 32b87050aeb..54e16312802 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -1106,17 +1106,55 @@ import {
 import {
   googleSlidesAddImageTool,
   googleSlidesAddSlideTool,
+  googleSlidesBatchUpdateTool,
+  googleSlidesCopyPresentationTool,
+  googleSlidesCreateLineTool,
+  googleSlidesCreateParagraphBulletsTool,
   googleSlidesCreateShapeTool,
+  googleSlidesCreateSheetsChartTool,
   googleSlidesCreateTableTool,
   googleSlidesCreateTool,
+  googleSlidesCreateVideoTool,
   googleSlidesDeleteObjectTool,
+  googleSlidesDeleteParagraphBulletsTool,
+  googleSlidesDeleteTableColumnTool,
+  googleSlidesDeleteTableRowTool,
+  googleSlidesDeleteTextTool,
   googleSlidesDuplicateObjectTool,
+  googleSlidesExportPresentationTool,
   googleSlidesGetPageTool,
   googleSlidesGetThumbnailTool,
+  googleSlidesGroupObjectsTool,
+  googleSlidesInsertTableColumnsTool,
+  googleSlidesInsertTableRowsTool,
   googleSlidesInsertTextTool,
+  googleSlidesMergeTableCellsTool,
   googleSlidesReadTool,
+  googleSlidesRefreshSheetsChartTool,
+  googleSlidesReplaceAllShapesWithImageTool,
+  googleSlidesReplaceAllShapesWithSheetsChartTool,
   googleSlidesReplaceAllTextTool,
+  googleSlidesReplaceImageTool,
+  googleSlidesRerouteLineTool,
+  googleSlidesUngroupObjectsTool,
+  googleSlidesUnmergeTableCellsTool,
+  googleSlidesUpdateImagePropertiesTool,
+  googleSlidesUpdateLineCategoryTool,
+  googleSlidesUpdateLinePropertiesTool,
+  googleSlidesUpdatePageElementAltTextTool,
+  googleSlidesUpdatePageElementsZOrderTool,
+  googleSlidesUpdatePageElementTransformTool,
+  googleSlidesUpdatePagePropertiesTool,
+  googleSlidesUpdateParagraphStyleTool,
+  googleSlidesUpdateShapePropertiesTool,
+  googleSlidesUpdateSlidePropertiesTool,
   googleSlidesUpdateSlidesPositionTool,
+  googleSlidesUpdateTableBorderPropertiesTool,
+  googleSlidesUpdateTableCellPropertiesTool,
+  googleSlidesUpdateTableColumnPropertiesTool,
+  googleSlidesUpdateTableRowPropertiesTool,
+  googleSlidesUpdateTextStyleTool,
+  googleSlidesUpdateVideoPropertiesTool,
   googleSlidesWriteTool,
 } from '@/tools/google_slides'
 import {
@@ -4527,6 +4565,45 @@ export const tools: Record<string, ToolConfig> = {
   google_slides_create_table: googleSlidesCreateTableTool,
   google_slides_create_shape: googleSlidesCreateShapeTool,
   google_slides_insert_text: googleSlidesInsertTextTool,
+  google_slides_update_text_style: googleSlidesUpdateTextStyleTool,
+  google_slides_update_paragraph_style: googleSlidesUpdateParagraphStyleTool,
+  google_slides_delete_text: googleSlidesDeleteTextTool,
+  google_slides_create_paragraph_bullets: googleSlidesCreateParagraphBulletsTool,
+  google_slides_delete_paragraph_bullets: googleSlidesDeleteParagraphBulletsTool,
+  google_slides_replace_all_shapes_with_image: googleSlidesReplaceAllShapesWithImageTool,
+  google_slides_replace_image: googleSlidesReplaceImageTool,
+  google_slides_update_image_properties: googleSlidesUpdateImagePropertiesTool,
+  google_slides_update_shape_properties: googleSlidesUpdateShapePropertiesTool,
+  google_slides_update_page_properties: googleSlidesUpdatePagePropertiesTool,
+  google_slides_update_slide_properties: googleSlidesUpdateSlidePropertiesTool,
+  google_slides_update_page_element_alt_text: googleSlidesUpdatePageElementAltTextTool,
+  google_slides_update_page_element_transform: googleSlidesUpdatePageElementTransformTool,
+  google_slides_update_page_elements_z_order: googleSlidesUpdatePageElementsZOrderTool,
+  google_slides_group_objects: googleSlidesGroupObjectsTool,
+  google_slides_ungroup_objects: googleSlidesUngroupObjectsTool,
+  google_slides_create_line: googleSlidesCreateLineTool,
+  google_slides_update_line_properties: googleSlidesUpdateLinePropertiesTool,
+  google_slides_update_line_category: googleSlidesUpdateLineCategoryTool,
+  google_slides_reroute_line: googleSlidesRerouteLineTool,
+  google_slides_insert_table_rows: googleSlidesInsertTableRowsTool,
+  google_slides_insert_table_columns: googleSlidesInsertTableColumnsTool,
+  google_slides_delete_table_row: googleSlidesDeleteTableRowTool,
+  google_slides_delete_table_column: googleSlidesDeleteTableColumnTool,
+  google_slides_merge_table_cells: googleSlidesMergeTableCellsTool,
+  google_slides_unmerge_table_cells: googleSlidesUnmergeTableCellsTool,
+  google_slides_update_table_cell_properties: googleSlidesUpdateTableCellPropertiesTool,
+  google_slides_update_table_border_properties: googleSlidesUpdateTableBorderPropertiesTool,
+  google_slides_update_table_column_properties: googleSlidesUpdateTableColumnPropertiesTool,
+  google_slides_update_table_row_properties: googleSlidesUpdateTableRowPropertiesTool,
+  google_slides_create_sheets_chart: googleSlidesCreateSheetsChartTool,
+  google_slides_refresh_sheets_chart: googleSlidesRefreshSheetsChartTool,
+  google_slides_replace_all_shapes_with_sheets_chart:
+    googleSlidesReplaceAllShapesWithSheetsChartTool,
+  google_slides_create_video: googleSlidesCreateVideoTool,
+  google_slides_update_video_properties: googleSlidesUpdateVideoPropertiesTool,
+  google_slides_batch_update: googleSlidesBatchUpdateTool,
+  google_slides_copy_presentation: googleSlidesCopyPresentationTool,
+  google_slides_export_presentation: googleSlidesExportPresentationTool,
   pdl_person_enrich: pdlPersonEnrichTool,
   pdl_person_search: pdlPersonSearchTool,
   pdl_person_identify: pdlPersonIdentifyTool,

From 4ca7651ea66425a6f4c0886699dbda028a2d513e Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 14:18:30 -0700
Subject: [PATCH 09/16] improvement(knowledge): eliminate N+1 on tag
 definitions in bulk upload (#4681)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* improvement(knowledge): eliminate N+1 on tag definitions in bulk upload

createDocumentRecords previously called processDocumentTags per-doc, each
running a SELECT against knowledge_base_tag_definitions — N queries that
all returned the same kbId-scoped rows. Worse, those reads used the
global db pool while the tx held a FOR UPDATE lock on the KB row, risking
pool contention on large bulk uploads.

Split the helper into loadTagDefinitions (single query, accepts the tx as
executor) and resolveDocumentTags (pure, takes the pre-loaded Map). The
bulk path loads once inside the transaction; createSingleDocument loads
once outside its tx. Same throw-on-validation-error semantics preserved.

* improvement(knowledge): fold processDocumentAsync prefetches into one JOIN

processDocumentAsync was issuing three separate SELECTs per processed
document: knowledge_base (config), workspace (billing settings), and
document (tag values). For a typical Trigger.dev fleet processing
thousands of docs, that's thousands of redundant pool checkouts.

Collapsed into a single JOIN at the top of processDocumentAsync that
fetches kb config + billed account user + document tag values in one
roundtrip. The post-embedding tag SELECT (which previously held tags
through the full embedding-generation wait) is gone; tags from the
initial prefetch are reused.

Behavior:
- Missing/archived/deleted document or KB → same 'failed' status outcome
  as before, single consolidated error message.
- Missing billed account → preserves existing error.
- All 208 KB tests pass (test mock extended for innerJoin/leftJoin).

* improvement(knowledge): skip tag-definitions load when no doc carries tags

Trim verbose comments in the same pass.

* lint
---
 apps/sim/app/api/knowledge/utils.test.ts    |  26 ++++
 apps/sim/lib/knowledge/documents/service.ts | 148 +++++++++++---------
 2 files changed, 108 insertions(+), 66 deletions(-)

diff --git a/apps/sim/app/api/knowledge/utils.test.ts b/apps/sim/app/api/knowledge/utils.test.ts
index 1886c1659e1..326bbee660f 100644
--- a/apps/sim/app/api/knowledge/utils.test.ts
+++ b/apps/sim/app/api/knowledge/utils.test.ts
@@ -116,6 +116,32 @@ vi.mock('@sim/db', async () => {
             },
           }
         },
+        innerJoin() {
+          // document × knowledge_base context JOIN — return the first kb and
+          // doc row merged (covers processDocumentAsync's prefetch).
+          return {
+            leftJoin: () => ({
+              where: () => ({
+                limit: (n: number) =>
+                  Promise.resolve(
+                    kbRows.length > 0 && docRows.length > 0
+                      ? [
+                          { ...kbRows[0], ...docRows[0], billedAccountUserId: 'billing-user-1' },
+                        ].slice(0, n)
+                      : []
+                  ),
+              }),
+            }),
+            where: () => ({
+              limit: (n: number) =>
+                Promise.resolve(
+                  kbRows.length > 0 && docRows.length > 0
+                    ? [{ ...kbRows[0], ...docRows[0] }].slice(0, n)
+                    : []
+                ),
+            }),
+          }
+        },
       }
     },
   }
diff --git a/apps/sim/lib/knowledge/documents/service.ts b/apps/sim/lib/knowledge/documents/service.ts
index be71c279717..687f3ef3310 100644
--- a/apps/sim/lib/knowledge/documents/service.ts
+++ b/apps/sim/lib/knowledge/documents/service.ts
@@ -5,6 +5,7 @@ import {
   knowledgeBase,
   knowledgeBaseTagDefinitions,
   knowledgeConnector,
+  workspace as workspaceTable,
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { sha256Hex } from '@sim/security/hash'
@@ -47,7 +48,6 @@ import type { ProcessedDocumentTags } from '@/lib/knowledge/types'
 import { estimateTokenCount } from '@/lib/tokenization/estimators'
 import { deleteFile } from '@/lib/uploads/core/storage-service'
 import { extractStorageKey } from '@/lib/uploads/utils/file-utils'
-import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
 import type {
   DocumentProcessingPayload,
   processDocument as processDocumentTask,
@@ -111,11 +111,26 @@ interface DocumentTagData {
   value: string
 }
 
-async function processDocumentTags(
+type TagDefinition = typeof knowledgeBaseTagDefinitions.$inferSelect
+type TagDefinitionsByName = Map<string, TagDefinition>
+type DbExecutor = Pick<typeof db, 'select'>
+
+async function loadTagDefinitions(
   knowledgeBaseId: string,
+  executor: DbExecutor = db
+): Promise<TagDefinitionsByName> {
+  const defs = await executor
+    .select()
+    .from(knowledgeBaseTagDefinitions)
+    .where(eq(knowledgeBaseTagDefinitions.knowledgeBaseId, knowledgeBaseId))
+  return new Map(defs.map((def) => [def.displayName, def]))
+}
+
+function resolveDocumentTags(
   tagData: DocumentTagData[],
+  tagDefinitions: TagDefinitionsByName,
   requestId: string
-): Promise<ProcessedDocumentTags> {
+): ProcessedDocumentTags {
   const setTagValue = (
     tags: ProcessedDocumentTags,
     slot: string,
@@ -200,13 +215,6 @@ async function processDocumentTags(
     return result
   }
 
-  const existingDefinitions = await db
-    .select()
-    .from(knowledgeBaseTagDefinitions)
-    .where(eq(knowledgeBaseTagDefinitions.knowledgeBaseId, knowledgeBaseId))
-
-  const existingByName = new Map(existingDefinitions.map((def) => [def.displayName, def]))
-
   const undefinedTags: string[] = []
   const typeErrors: string[] = []
 
@@ -223,7 +231,7 @@ async function processDocumentTags(
 
     if (!hasValue) continue
 
-    const existingDef = existingByName.get(tagName)
+    const existingDef = tagDefinitions.get(tagName)
     if (!existingDef) {
       undefinedTags.push(tagName)
       continue
@@ -264,7 +272,7 @@ async function processDocumentTags(
 
     if (!hasValue) continue
 
-    const existingDef = existingByName.get(tagName)
+    const existingDef = tagDefinitions.get(tagName)
     if (!existingDef) continue
 
     const targetSlot = existingDef.tagSlot
@@ -418,34 +426,66 @@ export async function processDocumentAsync(
   try {
     logger.info(`[${documentId}] Starting document processing: ${docData.filename}`)
 
-    const kb = await db
+    // KB config + workspace billing + doc tags in one JOIN (was 3 SELECTs).
+    const contextRows = await db
       .select({
         userId: knowledgeBase.userId,
         workspaceId: knowledgeBase.workspaceId,
         chunkingConfig: knowledgeBase.chunkingConfig,
         embeddingModel: knowledgeBase.embeddingModel,
+        billedAccountUserId: workspaceTable.billedAccountUserId,
+        tag1: document.tag1,
+        tag2: document.tag2,
+        tag3: document.tag3,
+        tag4: document.tag4,
+        tag5: document.tag5,
+        tag6: document.tag6,
+        tag7: document.tag7,
+        number1: document.number1,
+        number2: document.number2,
+        number3: document.number3,
+        number4: document.number4,
+        number5: document.number5,
+        date1: document.date1,
+        date2: document.date2,
+        boolean1: document.boolean1,
+        boolean2: document.boolean2,
+        boolean3: document.boolean3,
       })
-      .from(knowledgeBase)
-      .where(and(eq(knowledgeBase.id, knowledgeBaseId), isNull(knowledgeBase.deletedAt)))
+      .from(document)
+      .innerJoin(knowledgeBase, eq(knowledgeBase.id, document.knowledgeBaseId))
+      .leftJoin(
+        workspaceTable,
+        and(eq(workspaceTable.id, knowledgeBase.workspaceId), isNull(workspaceTable.archivedAt))
+      )
+      .where(
+        and(
+          eq(document.id, documentId),
+          eq(knowledgeBase.id, knowledgeBaseId),
+          isNull(document.archivedAt),
+          isNull(document.deletedAt),
+          isNull(knowledgeBase.deletedAt)
+        )
+      )
       .limit(1)
 
-    if (kb.length === 0) {
+    if (contextRows.length === 0) {
       logger.warn(
-        `[${documentId}] Skipping document processing: knowledge base ${knowledgeBaseId} is deleted`
+        `[${documentId}] Skipping document processing: document or knowledge base ${knowledgeBaseId} no longer exists`
       )
       await db
         .update(document)
         .set({
           processingStatus: 'failed',
-          processingError: 'Knowledge base deleted',
+          processingError: 'Document or knowledge base no longer exists',
           processingCompletedAt: new Date(),
         })
-        .where(
-          and(eq(document.id, documentId), isNull(document.archivedAt), isNull(document.deletedAt))
-        )
+        .where(eq(document.id, documentId))
       return
     }
 
+    const ctx = contextRows[0]
+
     await db
       .update(document)
       .set({
@@ -460,7 +500,7 @@ export async function processDocumentAsync(
 
     logger.info(`[${documentId}] Status updated to 'processing', starting document processor`)
 
-    const rawConfig = kb[0].chunkingConfig as {
+    const rawConfig = ctx.chunkingConfig as {
       maxSize?: number
       minSize?: number
       overlap?: number
@@ -473,13 +513,13 @@ export async function processDocumentAsync(
       overlap: rawConfig?.overlap ?? 200,
     }
 
-    const kbEmbeddingModel = kb[0].embeddingModel
-    if (!kb[0].workspaceId) {
+    const kbEmbeddingModel = ctx.embeddingModel
+    if (!ctx.workspaceId) {
       throw new Error(`Knowledge base ${knowledgeBaseId} is missing workspace billing context`)
     }
-    const billingUserId = await getWorkspaceBilledAccountUserId(kb[0].workspaceId)
+    const billingUserId = ctx.billedAccountUserId
     if (!billingUserId) {
-      throw new Error(`Workspace ${kb[0].workspaceId} is missing billed account`)
+      throw new Error(`Workspace ${ctx.workspaceId} is missing billed account`)
     }
     let totalEmbeddingTokens = 0
     let embeddingIsBYOK = false
@@ -495,8 +535,8 @@ export async function processDocumentAsync(
           kbConfig.maxSize,
           kbConfig.overlap,
           kbConfig.minSize,
-          kb[0].userId,
-          kb[0].workspaceId,
+          ctx.userId,
+          ctx.workspaceId,
           rawConfig?.strategy,
           rawConfig?.strategyOptions
         )
@@ -534,7 +574,7 @@ export async function processDocumentAsync(
               isBYOK,
               modelName,
               pricingId,
-            } = await generateEmbeddings(batch, kbEmbeddingModel, kb[0].workspaceId)
+            } = await generateEmbeddings(batch, kbEmbeddingModel, ctx.workspaceId)
             for (const emb of batchEmbeddings) {
               embeddings.push(emb)
             }
@@ -547,41 +587,10 @@ export async function processDocumentAsync(
           }
         }
 
-        logger.info(`[${documentId}] Embeddings generated, fetching document tags`)
-
-        const documentRecord = await db
-          .select({
-            tag1: document.tag1,
-            tag2: document.tag2,
-            tag3: document.tag3,
-            tag4: document.tag4,
-            tag5: document.tag5,
-            tag6: document.tag6,
-            tag7: document.tag7,
-            number1: document.number1,
-            number2: document.number2,
-            number3: document.number3,
-            number4: document.number4,
-            number5: document.number5,
-            date1: document.date1,
-            date2: document.date2,
-            boolean1: document.boolean1,
-            boolean2: document.boolean2,
-            boolean3: document.boolean3,
-          })
-          .from(document)
-          .where(
-            and(
-              eq(document.id, documentId),
-              isNull(document.archivedAt),
-              isNull(document.deletedAt)
-            )
-          )
-          .limit(1)
-
-        const documentTags = documentRecord[0] || {}
+        // Tag values prefetched above; reuse for the embedding rows.
+        const documentTags = ctx
 
-        logger.info(`[${documentId}] Creating embedding records with tags`)
+        logger.info(`[${documentId}] Embeddings generated, creating embedding records with tags`)
 
         const tokenizerProvider = getEmbeddingModelInfo(kbEmbeddingModel).tokenizerProvider
 
@@ -686,7 +695,7 @@ export async function processDocumentAsync(
         if (cost > 0) {
           await recordUsage({
             userId: billingUserId,
-            workspaceId: kb[0].workspaceId ?? undefined,
+            workspaceId: ctx.workspaceId ?? undefined,
             entries: [
               {
                 category: 'model',
@@ -770,6 +779,12 @@ export async function createDocumentRecords(
       throw new Error('Knowledge base not found')
     }
 
+    // One load per batch (was N+1); skip entirely if no doc carries tags.
+    const hasTaggedDocs = documents.some((d) => d.documentTagsData)
+    const tagDefinitions = hasTaggedDocs
+      ? await loadTagDefinitions(knowledgeBaseId, tx)
+      : (new Map() as TagDefinitionsByName)
+
     const now = new Date()
     const documentRecords = []
     const returnData: DocumentData[] = []
@@ -783,7 +798,7 @@ export async function createDocumentRecords(
         try {
           const tagData = JSON.parse(docData.documentTagsData)
           if (Array.isArray(tagData)) {
-            processedTags = await processDocumentTags(knowledgeBaseId, tagData, requestId)
+            processedTags = resolveDocumentTags(tagData, tagDefinitions, requestId)
           }
         } catch (error) {
           if (error instanceof SyntaxError) {
@@ -1277,7 +1292,8 @@ export async function createSingleDocument(
     try {
       const tagData = JSON.parse(documentData.documentTagsData)
       if (Array.isArray(tagData)) {
-        processedTags = await processDocumentTags(knowledgeBaseId, tagData, requestId)
+        const tagDefinitions = await loadTagDefinitions(knowledgeBaseId)
+        processedTags = resolveDocumentTags(tagData, tagDefinitions, requestId)
       }
     } catch (error) {
       if (error instanceof SyntaxError) {

From 9347da5e5bff91896f08eef44f339fd6eb2c67f6 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 14:22:11 -0700
Subject: [PATCH 10/16] improvement(branding): white-background sim wordmark
 for og image (#4683)

Swap the default Open Graph and Twitter card image from the purple "sim"
lettermark on purple to the brand wordmark (green icon + dark "sim" text)
centered on a white background. Pulled directly from the sidebar's
wordmark-dark.svg so the asset stays in sync with the in-app brand.

- New asset at /logo/426-240/reverse/small.png (2130x1200, matches
  declared OG dimensions)
- Default branded metadata + landing-page-specific overrides both updated;
  all sub-pages that inherit the default pick up the new image
  automatically

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
---
 apps/sim/app/page.tsx                         |   4 ++--
 apps/sim/ee/whitelabeling/metadata.ts         |   4 ++--
 .../sim/public/logo/426-240/reverse/small.png | Bin 8324 -> 31802 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/sim/app/page.tsx b/apps/sim/app/page.tsx
index c12a4a75e3d..58c64b1d8f0 100644
--- a/apps/sim/app/page.tsx
+++ b/apps/sim/app/page.tsx
@@ -31,7 +31,7 @@ export const metadata: Metadata = {
     locale: 'en_US',
     images: [
       {
-        url: '/logo/426-240/primary/small.png',
+        url: '/logo/426-240/reverse/small.png',
         width: 2130,
         height: 1200,
         alt: 'Sim — The AI Workspace for Teams',
@@ -47,7 +47,7 @@ export const metadata: Metadata = {
     description:
       'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM to create agents that automate real work.',
     images: {
-      url: '/logo/426-240/primary/small.png',
+      url: '/logo/426-240/reverse/small.png',
       alt: 'Sim — The AI Workspace for Teams',
     },
   },
diff --git a/apps/sim/ee/whitelabeling/metadata.ts b/apps/sim/ee/whitelabeling/metadata.ts
index d7059637731..038b2bd571b 100644
--- a/apps/sim/ee/whitelabeling/metadata.ts
+++ b/apps/sim/ee/whitelabeling/metadata.ts
@@ -72,7 +72,7 @@ export function generateBrandedMetadata(override: Partial<Metadata> = {}): Metad
       siteName: brand.name,
       images: [
         {
-          url: brand.logoUrl || '/logo/426-240/primary/small.png',
+          url: brand.logoUrl || '/logo/426-240/reverse/small.png',
           width: 2130,
           height: 1200,
           alt: brand.name,
@@ -83,7 +83,7 @@ export function generateBrandedMetadata(override: Partial<Metadata> = {}): Metad
       card: 'summary_large_image',
       title: defaultTitle,
       description: summaryFull,
-      images: [brand.logoUrl || '/logo/426-240/primary/small.png'],
+      images: [brand.logoUrl || '/logo/426-240/reverse/small.png'],
       creator: '@simdotai',
       site: '@simdotai',
     },
diff --git a/apps/sim/public/logo/426-240/reverse/small.png b/apps/sim/public/logo/426-240/reverse/small.png
index f9c914f4e70b824b492f02789090d0f6c4481d94..7e6e45b866aabb13755111b02cfd77a3be52ba6c 100644
GIT binary patch
literal 31802
zcmeFabySsG*EWuN6a@tl5Rnp4LIebqE)fJ3q>+#=0V(OWkdhEYIz*%e=?0Z<=?3ZU
z*uW-!YwZojdG+`H^L=A{&lnG5a1I0Rd&QjBob#G<&9(KAx+i)H>pT_)2F9t|V!|>Q
z7{|f)Kc9{t1HWmxvMmh$cfw3e$pQm|i5h+%vi%@nje&6i<F@b(IoqDu{+VP7%R^P>
zd#?5|B4=cxaW57oNYh<Zt(Gc39W$G8$3a73>+@HS@&2(Zru0fD4Db~18JL6+#kAzB
z+>P*x>wQqrU`1*%H*1{}k!jPbaY2<_te2~F(6RXY3hs7^BZbpo>EMDpSOw~<YvDM>
zq5Yo)h2W~;*OM0n=pVpZ=?{K71NMRbx)^)#lbG1S%YJ@`_kVeT^636g{~Zu5i2vg<
zJpNy$K*|0m;ZX3umI77wpX3}c{_78+%KoE5z<&c0N@f31X7+zPJpOk;6bSw=hR6RT
zeEpY&qR{Xk#g_i-#!))^Zytt*?tfD1`QJnsrL+I1y)G#Y`&>^4TbTNM`YD&Wr!H3v
zI_xv|`lw0XW=}>XlXP=Ux1crwi3I1PR|_GNk|gSrNrag^7E8uX-)oW^2EOr^EFx74
z92G1?BaM+8OhKsH2?XlrZ{4i?9sNd;U3<rwj(vKbEj!Wla6D;nZs&t%0~0YE7)ItN
zPdS<+=hgQn?x~o)cXQ#<L4K3%w5l3(8SE-I3BrMop+*xt-_6xych_b7-5`yzKJ%t#
zU2dw)Cj2uh2%mhTFWR}9?#f};mrK84<vHW9(LV7&2>u=AM2~2GiIb0D-8<&H#jeXU
zRby1J5Lf{#Py4H&&wf-_a4$ljOuIy4^Il(JH+56q8~9fgj^oO!8>L+)G>>HCHWuc5
zcyFY75B?1`a)4nBU&LM?ANhjuck9Yw6_WnqvP-b^gYsHe4fH;$4>u1Sv*t*(@A~EU
z^f|A5t$Ln?kk1-x*t8TGDd!uP>;8Dnth&E={Dkis`(okjCguZ$AG5i&ZA5zTr%z&%
zPaD%Y2Wsg|=mnjHe?<w2a;4me*)}%!T{oZ6M1B_hJ!<_pA;}8$>w=~?Gnsi;WPg3Z
zVtlxl_gk;jPI1-bJQ))cd<CVJ=O!bmAIT?-Cv!AfF9#99-=n6uk*l+EmweoK(t41=
zOH~d29wi3M{=WM`_QARDdKr@`EbL%C45b)S%hDcXgEQ_5`=dgWG14F+4Y3sar4Qr$
z+qSubb~Zr|?5&8@c#91tT#WXZHpXoVHvAbv?N%Zh?9J{;3KXWO7Fr{}9ZddabF*g?
zHTmWWZb1>o5yRe`xgGnCn@*cXL{@z#;#c3k_i?)EfMlVy?BG(L9`Bu>9=kr{7!3x1
zAl8uSFI=a`U7?A^_`a93y-BEQ+x($;M0LTTY^i*&M`h6ZK@|5)pI(zwmWRg)3RVmZ
zl>Lf{X@WP-=`bjibmg})by4t<raT!gog0<CXSyCP>iB(s_zRS-A%2H7zC9W&dC!nm
zoJj4<zw395V6Vi2-$9Kz)wu>r1tr}V1bRYPPi`#cjxlU4iZ%wfJsDo(+3H_d*u@;@
zJid<|KfkZyVu!8<&Tm#Yk*zf%#Fd1XwwxTc+P!^!c|c_n1u*ass8Wi@@j0wt(;lBY
zf+tnvJaMluIz62Q^Phe7pOFdnJN$%(J|=H*c<Km|G-+47z)E1H^}MCj{>r1v7-Kg^
zW5NoZ$NF|ZncD&5GA(OlG#)4}qp>5gF*Y8{c|Bg7lc927V4(Z%{An4CA`eyPcEmCE
z7|u^klE{KmXo@HxkTFqKOnI3YbZlLcnBA#lcy2HhM}+Ka6*voCs@a~TMc_CJn`^YD
z<$ZYy<be{$OTO4H1RXzndavfmrylE;opmm=!jwlphkaF#RO@*yN+EEKvZ91<wO5pk
zbYCYA6>oYv`7S#@*V^FC&{U#rDpU|VWOj~(tiQ!Ua(7ZngaBz>pH7=?-Oqq?dLN6|
z9#K{VGH+KNI+?DXszMiw!TCycy`T6dln7Dj)+x;D(yl^WT87%Jp)!{;{jNZrvxja7
z-uQ=&D&yH9HcxkALJOSWs~Qh1KBt@$#1kR-f{}0zgAmUzMdu>5UCU0hzKulM<Y~P)
zWcW-{L9+Frl*rmjIKS-L_B{>^jMK1;;(o=IfULxh%Cq*)6~Ri?>qAzQM+M2x@9o5H
zh<@y6C6T$fGUO+D<s#T5EN))NI3wd&qLbtmg{haObf!U|P(tjGpZ-0rk4ACSo;vG1
z8`X3SD~DMC7Jy1H1Y`MQIi2b=nH<UUjcYOB&>_6K%8!(aO~!9}>byKjW^x0FTnN_S
zUa$KN2Xd(wEZU9MU1|jovKw7aHf{8BrwSRl$6fafl(ApHS~k@jWkr3vm+A(u%man<
zNEhdLzrz<O=BFwyNf$bM6`i2ZNmXJVZ&H7#`D5e`KdptKT-V&diKu{*Df(E9>LUv-
zoL5Y#Jog%8n@V(keKMxM8uP&_uVr)IeYl42(=(<Gg?_`MjT1_WKX!FJc5<-+pUIy5
z&evmLQ|n~klAH!y33xiX8SdP@%LtqnT3Ri{GOL!&D^j_)O|j@PSWU)i<<sT8?d^zU
zF0vUc%VD3~*TQkiqm;22(czUoVSYh)BCJO+opc};QG%h2y#QA7rnPqgr?J;>xH+;(
zN#kH8$LYbV7-OsDvdrVgV&?tcd{?d>O#XrZ$m_}Df`zBF%j~gvqn;%H^KT!kcI-%G
z!kq@j&YlC>1@k~yfN2G}tV%~picZltPCiaN3eHI2JU{`@fLf*QA^P?d2VN2osdh9R
zKC-VDA+Z|(A$0Lo_WV(~loi?iCb^%134(n=EI_c;PBrWvSz(X0ootS0{P!}q)(g$S
zQcj-RDES}LF({<GVodIAsPohMT3++7m3}_fweX#Kg(;>>volUwS=rG1cfmb+lAJmd
zX+v3YJ3i9rho;d&eH8tL;v`gWqP}{@r{7o0E@f_hyDfE)3c%!}QHR$i_F3g02tdo7
zWC$WO%x^d^pfMx*U$3{kNfao5+deZcBF3UKX@(7q4P|j?U2EW5au*woQ+w{<@Uzy|
z)?T6cU2PIqO}5Ls3iOJ_-3S0y>xB;Bj}~*+$<(6txAnIO$hfW2pZsg)fJ=9SMEY+b
zb(vxk@?}RhhN_6qLXY!PyPx$|r}U|{lFxVBS5)0iE72SRL;M0ZxhL~BeL*4a!zn9F
znHs+je_71HzyL0On%eWN8##Wm!pEF{KO%L8E{l71qwN-fcUZP3lpNjfhz-=J@C-EX
zyRH9$Ddu6$peBpaIw>}Y4!=k!`V1i<p=jsbR0#=T^T{FF%9x6~SAfBwEej3q%gcA7
zoTV+|E9K8iKXA0mRaBAF0lw##tuS#55{3bnlVvoR-g3m#-h18G=9sevfXFWofyhTd
z&%of-xm7~8hT#14^@yi&j`8V!lM*(C6ve5pzd;;Gkv_0U>wRZkT9q1d*C-Q{AlrI?
znn<cXjAPLCH%kHbz^XHv&}`mr)&KrWB&LZBZ*%&}=2B(YLV1#WvZ~y#LU9FdY$UEJ
zm@sX1iio4%UJ}YU>ygEy+3sz>gx-gx3H{L`*GxJt<2-EV_u-jJdEnT*GNrb(Hn|WJ
z8(Urh7Wvag(FajKH4d%tUz5RK{8Tx*r2fARfB_+dasucHP);7`j8fz{J^a(Yc8*iJ
z`cb_g5W=d?7^}Nq{=y?*q>M7Eysj8o@t!Zri)Y^cYHC5ML%78*p}A0%#c;xiq?Zes
zxeRIB)@0wT&Eo6kJf-BW%uUMD?IvY%d-3@_rjUF34^9)QSv&Q0?abSLAEF&`Rddq%
z{24J4W?EJG%+>3G<#*Fd2v747+Dc3cr|?3Ke#B>d^R>0yN@7(e?*N{tpu$d4yV=Cj
zzUTf(>6Ifr<GU7*OYiI=fCYIp>Z=k=sM^Xua3~|oNA`y8U{(fEm-r}UP6(TudtgUk
zcBClb%f?IiHkF(scG_C^#iX#ioH}K#VmW26YqBHBJ0>uwZH%+v*Go~uf4ihinY3%Z
zbKw(v)%dRIJ-(H%llC>)=Ek|b@2mK5$4W{ENO&*a@+Br(8E>#jKZMc(K=lg(%GlE~
zf@+EdkCa}W+mx6WoZJetFJGdKir^9Ju@2%J*)z^G`XISRcD`}|nd`016CT1dduLZw
z-Gz-tA@zZ7di3Xd^-ot{I&UlSF12}?*AQ})Yl=pag0Pe<GcTf|kVdk0evU#k%FMpc
za)z%tckoH@H9NyMZ;oGSq1*I1$7N{Ai~O2wJ{8DO`OYos98YI&VM}T0y0M)w#3IvK
z#}AUF=Xgwn2nY#PE<mr2GFY_oPaAmC@Soo@=-XKkwJ81i5dikG$0hc4DYi}dO#^*(
zQeS~hAxC6CCuXRhzCZ1aRp*_Ld6O9?&6ZK@iA6;1UFp)KE$bV7vRC}$*HYAqd%ns)
zonq6gSShxjh!kpxt$3He;GX5|vXiN>!@20Up8uJ;dyq}9G3N<7#sI9p@B?_3*IM%b
zkT2R!o7U20H0V-swtZTMCY-LRt;f!nbG)2wco3H#Z=^Iz=L@B_f2aOQGIm~@&wUTm
zp0n9eB;`1j^*PbmU9T>`EqldKt}i)mz-gf@Z#eYrKcefvgQ9u?R2~lrca)Y+FPLjs
z7H@?1*;t<8It;7=cxaS!enB9G2R!=Yw5dE0Ud<OveY`#zw$&w@4KL7exfgG3saRlU
zl7GON%F0Qg8`v{bd|)<Zl`h+_XJ<okCo(*McTImhh3l*X{zs)unyunBllc>O_7bvH
z2Apk-RWsFqCu2cmeXv^@SF!!Yr&Gp0kyzh(QPVs!@22Hjj7y(jHk_vCrW#gR5oF`l
zR7$G*To7xU(@75+P|+*e4g`11dmjPDt<|}OHHvi28{Ze3L`NfIvsCA3jw1R4|M3$g
zcQ7p4XfaCHs<=aP_&4Vg-4}N+j2t?t`K9k)JxU{;aJYHNoo7S(lJC()rIqZmBXoTI
z{r%;3k^Zzkj+~<befWw=Ek;g*jYoM5LPrgbzmB=Nq!YnyIqi>)jkQMp=AT2ImW7OZ
zO(8Sm8RWOG`SrzTZg~cI1{>RSvmtuIShTBpFJSz1{Xo&_C8EQ$3$l{VV?`p_+&H1^
zW;xv^h{=|<S^(;#hE<M8`}Gff*L%|&)$)zl&Ay3BKX@QB=DR7mOLqIpr#h1ci@g$2
z2mbpX_TuVN3+Szoj(g92la_a6m6gvItGh6S&bL+;Pvjz^jY-Nc-S6{r;KtlbH)|fw
z+iApnj5zP0vt!Zqnzkw$;Wj#a5p4`$ebDtCetSjrtW7^c46ui<Ph0ftN1fwa3&$f1
z1h;j?mU<IAAMWK%7tFJ4Jb#z|cr5A8rj0mK)1G%Q*~X+eY2n-A-gejvf+;L||C<B5
zM~;aAUsce#U9tVX!^C`7<bD<46$G<<dH^HPz1{LABk9H`*?93`)QaVH%0It^&?jHn
zT)uprG)LS_cbbdC@w@!cKi<J{Wlk}SahE@KV}yCemv_A_Z|_}X{!CDjp|(Zvb%%TN
zR>VXP>{YKl>RC4JloWd%=|^SfT6N>2ueEyjlWssr^44GSXl*VNN{gi}=56LUSRhV2
zXtX}_L>$9i0`-EQc5ne}LVBWx*(%_^H0RZ%joWGgEt@G`TEnsQ?CNir!Tj66l)G}r
z@XXikf~t<-3WV@{M?Nm^WYHWR4dy|_D`p#7r6?7$11^6qAYQzV@6<&uTbJb!HI#!Y
z_2D#l|BRASq}`1G_|YaO=f1n_&eQBY%mcP75k)2O7bO{PN5=Z`c2|a)4%~NkKXeG4
zlAx&DXj-<2$dY2y1mDvbEElrKf3DQM-60k73}Q{!6Y@;LruToobbo8rD`J}6Vy{cw
zVxu{Jbof1xoz2MO^f%X2^E&0Nfa|}aTvSdW^9wEyFN+O2AJIb4U~&=M`O;>PXA1pX
z-wkuLd*66}J0Sj6SQ$^Ay4>fBX+^fH9{MZ8y8-1-A=j|^W@^mfY~Ak^HHqjb+>JgA
z{0Sf`D5~mb-l|{k30(fvX*$=|RHv#9^R4>RGRNtK#Fo59=?Sh|KN=;M{?htRHb`7R
z^MZ#l4sUF6cFMEcYS|-G1i!8@BR(tZTBJj|4e*G#m;&^XI!^vpSTJH^@x;Q|GykN+
z>D_W1;43f)HumjM=j$sBzI%5)<tv2lxveGr-L7BPcDmaROJv5HmUFh|TX^4QQE;h-
zCfu*|6Uqwr*Mq`kag6=gNg6OOBe&hC5igq720q%n)<E^6${oGr^J~MAND79@PPs$B
zWDC{L4jmcvC7YQY^P_z(o7?Qn^0;jhZaC%%P?MSy^{!HKiGv_vlO2&7p@>LDVzIt>
z$d>jsgXSLP4`%mx$HEmeEJFl7|6-X(W9vh+jYdF5XO$4J)UDThY)L4M9|m3FNH>C-
zv@VCf9ls_g&+&v2?y4pMX372?D!ZL(ro!vFx9B7J!YKT`RDb16emDX<Sr?Satc%LR
zc|%7r_!>%aaA7oLAE*sXE{dW2kZD>+t<~6PmzaOQXla}$y}`OrCG2GVJ*%(^BI=T5
zQQ}{%^)fr8{KYjlaLkuiJBL8ha}sJLO31U~?%P{+>{VN@;%(1!7|D-G5{X4BK1N31
zmV@Y~7;sVoQUc(JHbzeV;-&=&Z{si+&K0?ph4DtRyV+FN*)(C($6UDS`2Y}V7XDu1
z-~#V;FAC>yX<diCmn!oaIK&Yy9Z3{BgT%AG*M5mDhXQA_OH8XeuFr5~(ff(cHHC2q
z0D9+n1(@Ch^DE%|`}DbQwrVsT(FR^Auw=nBe@CrTU?dady3NS7-0k#ZzxoAXf;g?X
z+g=^{&ru3xJttEift0=0AMf4t_?Z5}PH*K`5ibVgra|-0=cx|l6$FvuhkkiKdYBKm
zN>D>cy%~Bq9Oh4NnN(<i7IiMiDwa5k%<om{bM_)4Yi%pOQTqyv*iQ@@@dIj-C@_Eq
z10<{<-+qF%{CL4R9R?45EL$9btv8Cr_Er$MO2_FvJw4y=oQU6?9j_^-Rci8Fu3t&Z
zYqaBrRKH}?Iz?dk_pusgA;T3goEw*_6pm+Oa?i-ffM{(YmAUA!y6u&^9@6kWAH;qJ
zohTQs;hDYw><1&;5vn$Ww0aGZBfeZ{aYG6N(r68~+s-vgAg{sEu4lIBbn=D2e?9Iu
z+~`2DuGCOAwX>xXX5~xkHj_<~WoC@6fn(@onWCKCLt%wBbr^;~s{WZKl*J<FCe4bA
zUfs0SNI!xf1u1XJ3cq({77lIt*Z1Oj)=z2IcP)kKx}*WVp`63jVZ|8DH8<<UwkLe)
zR}jb>H1uTSgw)&X_o}YH0*>q@TvVK&*6y}ze$@u@)%e2fz-Y8$-oquDg@x3h2Q&6(
zzw_>nV()%Fg7Rc2jtk-gdkdf>7L!`Lk6|j)ahA{(4)oG5CNJ+|4|#jDekMj->y#>o
zfobVhPgtt<(?<4QcK2rO%1vrqG`^wD0xfn40xoXzU90wb|3V%!MC7#>1bp+()%qDv
z#zC!t!%&@8lCc{wfK<&xk^yJkDm@7qcG59XU;@zq6$;+8`nKxd0v5#mh-EAkFf}h`
zQAaYE)5yOhfN^K1rB6S@OmD*8p=$dmHixac4fn|5&Zg0M(;v(eRWcc~SUnNXqqAA2
z{n@4~+rZ@foYf-po*fXpYSdmMxdX+S<ojtjKru0wg*;nYS~fcIXg9B%{T^;N|A8bc
ze$Z**W@p2wo|mDO*5s$5-O1mD_SIozk3*$1C3k*l;NwWFY?C)h;UHNPVwwyTiwLMi
zy?p>%4&*rrJ-B!<Czs8I6_6X74<3;$=bBK*Ly|e_fOzYawgI6Lqjl3$U){F-i`k(j
zP*!3>6c?zy-%({-sk>+%d*AW*ea++o*3<XCWo7NNPJBVb<L2@*Uq1ZzCFjYEygV;&
zhn^)Qtjb%$e?QS$49jE{Ifb(!xt$yyw`lH#o`G`IeMwN0OqP?@-}cVzkmL>@&XxNc
z))m)t^VG)o>Kk(VXK)37M?W7-tp>>aAe{2%E6G{3MmeMv6colf^8iHn_a4j5Ke4ak
zb{OklGwCeRzMN_S!h)2Lr(=<6$f+nya_41c#N*{R??$gnqy}zg9yhCPqu9Ya{+rsj
zzq|^`Tp9PH=OW-j7S&m#O^U6&+XeCA{oa!s=56K?E7MZbYaGX*<w+A$R`lfyh-A-^
zaGzw)kM{?0U#Hk%vkyD<aYVg+y!OP(4&}dwztQQHR<nIWY`N!^%EE@tyxDale_Flp
zZ%g4_G0GA3X*U5J$0LjIpn#6L5fG^lG*Eup)Gg?DoQRqqS)dj70Z_E?u2*lQEh}BE
zx`2TyjR=XM*ubKC0F7kBDrGBh$rT^&51d;ex>CQb{A$b4k`$C8$8lrri(5FLL3o~|
zkK4J*w<~RwTkoO(*yU9KOEXlW4YOhMwx#$nn#~1d4lfl5Erh_GxEts6_CH0ai$8YK
zYYbg+SvQB|wIbkcD8)DSd)#Y%Fl#f1!3STm_#9-)1G55GL2_aSbE#v+0v8d3>W)*{
zwp;l@BfD<)m5jNAB>I;5*Kl?_&C>zzo(o(P2NY=I`RU(`c_VF9iY6J8!YzxBA7M1&
z=+E0Q)Jz-c9m;dPakc>PQPzD=AuUZ=A>V1$R6p^q(#JbS73q^dv$+w#TrPT3z?)vy
z<rN`=g2`eiD8~pO{t1IM9mK$%ZMe;le0pceUaePr_amSD?=3UVHpL}7CJ)9_CC+qa
z@g-^ZIrbJWHGam`n$DV%mdV(RTn?Bm1YSp^Dc)i1uvh<i3XO$r8-CJd4*@JRm)s8|
z(cc->GOpP?49G6?89i}6cP&p~EzPfsKwz7b+U8++`;kN<`?V9$?5Ko10~zjDSZ9aD
za))!~uh`{3pC0{Oz&bBmQ_O33{>Ec<@xz%yrx<d&b8gf}?aj1$_<y3p-kZPp^0u19
z@>0CIu(Y)K2bYcjTDyyq=?`7L8XVm@|7J9i>^F<O@y=oKbv&!hw{(l*V(pCyYAh`$
zg)}uX)dIDUnj?v$f&W1NDJLkl<d`;)h_o?QFEn`YxZ+g4dKL%)akYqzlx~aR*HuyU
z)d?}MVv+i#MYry;^j+n>2rH5~RB=i?{MsdXMAb!MJ3z?u@2e7MiL=ZGH0_xGZU#pg
z?Br~hv0h#wGlQiogxI#w%I7jky=B46AHR6{QL&QAklKnN<+fG)1t~X=x&ZPlgD08N
zv`U;g42vJYmnfaa9D=aCZq!)`5EoqQGWfbGGStDodfZV}RAh52j0I9jZQy6IX<|8-
z-dJou{nsLlCaa=!r_HFj1b61Bd$A=RCq!nezm2k9uYiJh)Ofor*&SL)Uw~GncT{kq
zLv@C(K-CWJ+AHo;hz4ZYVvqyEYaBC6qM?-b1fD-~h-1*FVHD8>3tPYkfb#J8o{@lm
zb||lIsKA-uv2o#&@4Kd!06OO_gBxGcx<@2S{1Sl<KHCixZNk|{>kiFq5~-50={MA@
zI$g9=zPbD+3}U`FyGJ*7JaIFZ)LcBi{uqJFDo8$Jbi=e)b~BxU_uQby`^|o0POHzr
z6A*FIhqDh%O-pfhyp0O`Bf(@zK8J+F@Ps@iqDBeH2fcUr)8;Q_PSktLHWhu_QqaKI
z82C<Uhai&!i7#K&JYjFUiGQw9E=U>E?bi%l%znq#4Px#`wtCKoB8#5AP$wh`DwnRZ
zYOH_S1`9^emnqQNovH){wDC2*vG?zyDowm`PYXPXyRGJ8u8k<vZcp0gcaH+uU0*Bv
zvK1K;R3C70e)IlxbobR9?$Y3}rWU5VRczsVon@}6|1trXZaIJ@^l9}Cu%z*!?k!<C
zpYE5hBKh$q$0^y3LBdXh*z%%_{<P3TGGASnEl!2^8%c}yyCx8AJdMlZ?=k`$J!6M`
z5!>SP*`k3F5B;0Ku~xTe?;uOrII)%jC36Qi1?O)I#<-t~vS=)&0%c$&zd_NoH76eE
zL(@9gyz%y3GOC{c#FG`I+I@#^^x(1_bGh24wc~v+-ln1aY1@!!6e<XwjT?JcRSs~C
zwN=6js}aV?m&5L-Yy(9fOVV2oI`Xhvr)1t&`#7h~7lm*;_M5vWc;ReX9JW>Fl_P4E
zB_&;A)22Uk|8wu7TnA7n<3{lw$*RVQDo|7ISL`6(-E>dLULhCqC=CHX@&So?y5{ao
zVftWI<Jx*-*c#t#bpYe#gBj9?Ec!Zq^C#^lLr*xl5{zcorIm24xe?V+l8+VXTNN_m
zW6G5AZ}P%vvKqm$j&Dng49A<njajeP>2pjDSTr4Mx34Y&a6Wn?aE{H|aaJx@NiD^E
zIW!E`sN@cmt5r50%{*`2yz(tXI}%^UuTwdfhq4`$$YBndM#sRADK++nborvBqZsmO
z+nfzQ^sOT2<B?>D{MRW}32C<+SSzB$&tP4YRKL)H)bS*<HV!2++8Mr^rX=-qiny8r
zB~|6ouM;8ExA-o`UNF7%RH(;AbGv$^NipG+<<eNcjLW&TH0pb(gxA<&#TZfWblV%8
z0(paQi!Zfp<1cu@Zu+nbqa9W=VDoP`*Z2VyW~BKkEjGs`0wR9jdezKpMAgUXtM7v%
z<h`}0B99ewHHN6L2}yR7m$E2s!Gh+SH*a1*YWp^SI8>#Nw>A+_Bw>P?@u=+Ss`x0o
zH95OA`^~lbv`rtY^*aqVMCeJ}Pr4H1O4?PqHc_WF5=&1xh>6|MJ-@o^Cr6=}#k+dW
zE9-S=7U#7!Oc~j@U9_0S%VitQISZb`L!oCrbU6tMv}#Us5+s^OE=fAoZ1vElQyt_5
z6~`K$s`nArdEU?8u#2|rXTbH@+cKv-YR712d@B@}!DQAsSENUbZ{Ch>%}v^LodRXm
z@=b?6_EZ7(+<%Q->P%#oiH*>gmjr4@GGDu>2feLKCu^)<?Gf0hmOXpsz$tYt=I^;7
zRJVB-JBmz`boP$ZCy00UcTu;y5mGp=rh_@OD}5w)G}}JfZ1X^HC56u!a(EaBh})EP
zi2>s61&B!TcPdYiy1EZ*NnY(%gidSDh@)Y4%VyTGMC6}?tb*M!)WurG5xF9c?Wbwc
zdByu?Nzr|=8v{HmeRpM@6j}7=dA$fo_L2w5tR)aP+QC5}2}GBCBPd8(XLbqKq^*F&
zSZqES){_^*CO_OCtez!LP%U*m`g0BwW#2sJ@sCP+c&rbt45Y((w`wl;@(5vFmhFAd
z9k(7G1Ifsveg^9<TUr}_=5{w}NUBg93&mzCZj_*6Z(`sF)dI&aF9@8Fr#?-F)p*2*
z2Xs3vmie+>+4m-_Gn<!B()%0mEI$p-(@J%%_S-aa@sYhHApZe*3*f-8W%yegxy-D~
zqV(B^_<URCnTdP4HZW<GzY2@{po}$3lO6&J?Rk)A7WvYF8mm@1$NSMl*>;<U!8OH;
zdV5d7aUklbCuFUB^_{%^g~<Ans6o8qiC6B!88X=ZS~aEv0uMO(dtPnW1TGL$9t|`A
z#9zii?De)xpah#`*J2yRt&fW7tZ;X=k)Tjx^SrB`J7VB^8nq{^*n*T+`yEH73CCba
z&5oIhFOrcQjcwMM0fXmB+fv&ut-Hyh!)y8PwZ8O>ouv_Z8<gUK7<VCxcS4FAu6z1D
zt9>)B{w%V2Oa?p41Mtv*t+E7<fH-JQ(jft)8=0Hld(JYjkpP@S<MM4~iKJp+6EQZ5
zTvqDErH!yp1?OR~dM2o+%DUU$M(VR?8tUA`$L-k4hA^FBS?jl5tilz))YLCK=*3Xt
z!gz0IeX7f0!#J^*8mP2Y;rjFk(2wx!Zd#^bSVBt56~oysI-t^<FF}O|5V;JL4YwJz
z_LE+&o|<^z4^HhtnM)gF$Y=AO^?|}gNFV-w;7s;WLlC%Uk@=HQ$6jCrg#}qBF<7}(
zj&0Bwd@E|(<Or*HufvQA`p4s>p3;bild8xi2Y?f60MDE}!pVuKpeo=YYTF{k);B?A
z>B@mH_05}W9}Y_m9H+mqJN=!i0Ti*`F^0{9@>RTjghTPRJ;X&I3kc|EKom8XP0-lm
z9*!;Yr1L+=XjgzsIMZX2t8Zd@F)i~D8V^cr55Fk7E#DG5^t#_K=58kgV~d{IbO=$L
zeFVkKCRisN4)EK-Q}51PG?(LdB}gk}`5dG045&uO#Iy)G;C2>gA6ga_2q)5763U~(
z*6MT3?_`O*vWOp8D&@+ht*9dSP%%+N5)`j1z~Nor>B~2k3!W?UEW9Sd6B*I_2ucCv
zF$(@2bN8y-c43v2@%%o3bZZJa?XT_4TBDZfqCFG3CgUL3y!|BS>_axO$PF{8nfJ0h
zlDunLaJ7Vd9M+}14bf+;ibs2jj??=)92qj8nF#?c0Vd68a^OerD?u?V2!t3-YB=A<
znT<)%`>6NAojcoSf?<h(-5@7Pni)V)`~CfxcN8vfH{Gf1JZ~>!UAf!@9HK=hAA`e1
zJFBy32V3p=p(1%01iHr;Ou<1APWDW$*cxR8$d4J%pvY!zxNR*LyWJ%f6}dNwN0tP_
zQi;^HDU&~+AZx0rC*K4$0i~<xc&1ZnEPIUe6-P*97)|lmbMX(|pf;GuA1hX7M1eYC
z%^;OINxJ%4LhUF#4hD?^>aR9xsT7_@N+N3O$-BY%>Dm2yV94T_zd`eA>paegMBGGb
z;t{9d#A}$@{M?{;4m$|Mpk1Y>%NE|iPCK4NRpZ=XDBS$Xpbo}mcX<tv5QTKp*32}c
ztDk~Bj1LNVamdW0p4$d&PH|}m<6a9Kf74nJx8*lXk!|he>UCCyP6#lnuHgLDS`y>M
z%dDWLU;mN-`2VuQ3h(&V`7g3LT(a{%g%+Ava^NMSk<n&J?iU<(EYHurT6-7Q^1x~5
zW1>LpqCGBZq-tVT%e+%+uKu*obXZ~``8b<~rRu!a5Yo+{C5e_;Z2NRe3@4(Hi0pG%
zQAi@g1X4rRfZTp{s*OVCVyQSI)A~ba)L_xDCNxhbKO2nSRQ*60W~IeAah}C}h3b0i
zb+`hJpEUMY7NJ{_Jo1XAiQAFGj?K-{&eWEgBQSALWkGK^dKkosPl_nfQCa{i>FJZ7
zt(>>fXNu*7oZ$f>(qtA9(#>2`O1Qtinpnb>;mI^|^9_?_!vcxfi86@~=hxaN#YyF^
zb*+2`)l1i-)bJdbZi07HoH?w}v$z8>SMN$tv-2cLUQUj5FGXGeA33(dEP8;FSfSfW
z21VD9UJsYL=Wqrj1{xMCWF4y$<v?GC59nK|E7z=O?;JGzavWBsYq{`gH}8Ek9Fz<W
z&qsIDFdc<eIDDjT7j2Zv74$;o5=X5t%g#!?!Y^^|ds<ji$K}}eJYVYgWfiX@y}HAn
zv_P_@4T@A}U!9hD;Wuom7t|jrsuU8WE1x|)?BAtV*w2<}YMs<uUvk?6;5)#B57k9>
z7Hz{x<zKVwEF_~j)dV${9o3>{nm@~VuP_&Iv$;KhEmY1M<}XE1V%YHF0!OxwX5Tz)
ziLugKZveSQjt2eGxA&6zT1`b9w(b?^a|pT67OT?3$_ho?uq!Q7ftmg2HT?Va-f3@l
z&zaUEFVBapt66Tu>0jH)D!geOfUsD-?<*{=<iU)QBn+~9-RblhB&ntC6}61EuOLx6
zEt8^e0!r8<JePX17lK2aEXo*dls>(g>@^jnS+55bvm8YfKAvE)nO79qYIf+G*KFJ$
zsg}kSX&u68^k#8oljvw5x*NB}8eRK}^g6f2!Y5O^NtX0S-A!kGQ8JT^10d?@qBkGU
z57N^cT%GD2eD<MSU;R~md8A$Do}d@{D6K0+A&{V=F0*vC;Fz}f7s=&S!h}2ExFa1L
z({_8&_mGl+Gl<WJ&%i}*Yl4cKmUevk8pm37eF-s}b<xqg9;4UQKywFd1remAr)TgE
z(sRMXbg}b2A_vB6BG!&vyMrq;v}(ar^FZvic=0VH&jw&El(8EPkEB1|gD3Ho_dG<&
zU1-<_=_4)QkQ;TRHaNX?MV~1>5xS~7CfPg`MoSubUc0`4YksCmOKIt{I!>(6Lg!$u
z4jA%d1i~GhrDeLmfK4GYarercjHd~vP_k?QaV<lUJ`)rw4n{0OG;Xt`H|g7O@?NhD
zwz8<5jMp-6z5_;t9YCOGX^oXc_M%0HT~Gz6N?f6#jCFs8LyyC^EgZ%z0?SYM$noe7
zQI(W8-41&>2U}NjaPH7=F8`9qQaL)_<6&A}>z`dhDi%@Z!^_o5DZ&aW4Ap$9?^9Ch
zp8;9YRfAJcdAuoD(qKzBy*KX|S#c-iq6r@8c%U5M%Pc$S1psX|%k6hFOU=v-U$M-<
z1jmPC!fDRyX`B6g#Xtxy{VvB`kIgG-b?=-6uzf71*u3Q)l}FPAo8X``q>BS|v=oDp
z0mX&Q6tGKYxdjuu%HfPFOWgPPP5s=e2w6<~K+MEkt%};NRO^5u4|>S%5!fT?BQ%N+
zKwf_oUuHEANeMO&T1tXEoGe;DA{0~Ja82hm9&COfB;VeAc5gERN7|d^D9>D}J!fS2
zlKB<I!oHxxA?Bc%Fe(8Krf)m9bA!xOZ4;b8P%Yf_1aTxIQC0`E+<}$i@-M#uE5(=O
z5(Tshp7K^R)ZkSpX-8W48DbeKr#MW1zM<Zyi)99RGLc01TK|gq%;=$J{l@AI&Gy6U
z$8=f{_%svX1iaM1S+KWHa}@;sE9^jhMJMU)OLyN&L{JIbiwf~@S^;ILvkbc2QC6?P
zG?1wJ-5&@MsQgk;GcyJHE|)&zE>wLI!Pl;w7Lk@wn0}5s>TNy8Gj1jRx?aGj-B<SB
z%=sP6lb-U)3M#8Ggj1OcVPS?%u{t#NiO+^XEGp7lG;ZF{8{C)qt*HW0J&Nnonr?G6
z%u$@?6KyuywY5=>-<}q+Z?E9lQOImt!@QqJ{$i<?dfvnIQ>eU4hdb6*|2rl-I5c9n
z+*&8mNS7H0^&r@mj#6di_oE}E1z|;@G&AGlw|BIqo3SX&qBTfemb;G<%5IzHq^NPg
z{w7P%YPqqRiI=W7ryNEJNp-cH*wU_B*`sMto|;^B(f?Ed6IQe^q@)XcoN9&&Yr+gb
zHw(+-DO~<8!7s!d&RR^D>B@tLb2F_P?9BlU8i`X`@Ob*1-!sZZ&BOx6sn_$MdXpzX
zCggc4Vw7AGGNgS!=C`d?I<+{D^IbwsJib}d4(sUY0g002O|MT{QyIGKci^M+*!29n
z^>H|q6)zhdp1UcgK-r>6)KE5gWr|JX=De$-(y;lwAi?%f=X!P+7TqpQ3TN!x5~}v|
z4SAC{9n}{`c@%YGf(i%UIp)K;zfpotY?x9hN@rAJp4W%~6*qkGN1q?bzgL?rcInOA
zST@No3l#AR>Jo-D3NmJN3n%Oec_P%V+n=^URvvbx31E=WqT|Y%=CKV}f+4*9=qs!|
z5-Ak5#H-H>zJ~9jJFS2U(QfhSLyqM`Zc8++D??wG_^UBoK4}ca!0eAM=I~d~kj(Ke
zjX%ukn7ub)!wu+J#7forGUYKvUnpwOrb;Lz_Zb{!N<gwZ*_vBQs{ln$8M}Wbw~vk6
ztwa4})nVfI0<7483*|4za2fg{8hM6a?kj8?u;ibKu>~$<3AFUEtHC8h50Bn9nuX~E
z9<d8(&wtp*!2cOz%&*8_XjUp)Q$$HA#QWUOXW^u1*nsV7Up9Qn6#D(hNhus~bOS5r
zhutoR!$aWA#=<LVlkK#it;a<6C8~MvU(>zt`x@ME9n;zTK0#pM2F8&$t^ObChW&D?
zyw1z8f~Lu<1(wCE@YF%CKHT^@Y6xf-Xi=m0EF`8`U)gwRM15`OXqO<v{Z!9&+He{j
zu_2U(r#c*l0k5$;B?fm1T+qK?eOaH$CIDYOZq$+DffG^SP9(#7YMmF=OL!7Fx<W_4
zwE6)CS8($AtEAx4OT#I#X*U)RKZ=cs8RneWW)Q|E4u;*JDkh~IG?F2DBd8@qO~E6X
zqbO*Cpjo-yEw0GY=|-f1&xg=jfKBoLU=xQtSEeBIU326=%c!Qc^0zll^-|PE%dkHY
zJF;%qK|D!O-jvm@x|M(5WqWZ1P^bNk{;nfu<-&R}9a{*SjT-2Pvwba8i8{OmB_0nv
z>QZ=)0Bq=>2@}=RLK%A%V42+)^t8bCucB${_pn9e+<MIf1TN}X=&*k53M6=+$60of
zx0^E>(uZHXYLu>uIt$7%Ft`27;Hsb-x^GXasSC7CfHz8(->)bURe+;YcnXX%MJPLT
zWB?n&lab5M1{M2fBG}sHZ_<}~Iw>k{MwQ^@x~$4rI_!1l>3x$eZTzl2(SwNE)lEfy
z4;gH7YuaV)bXg4}UhZ3n>-C#(iFj8UMe?$Ev951p$*Z)Hw%D12!)Yswc(;YwVnv^M
z&zaw4EGT~rw{^$szDoqN!yap{&*Tb{cyp$YeL7oxBDvFrBiE%L5tKjTyV5{XD(>67
z;~Zh?B4FcVx6-*e|Iu~>i5N~iK~Xu=%J2JHK*HxJ!`oCIUM8Q63|94%i|Vkz28ub7
z;eO4Dpf@mYVz(+LA%PPZBdUV{;N!rD9H)QfM|BxN)K|fxJwH3SskFyA*WeJ-4LY%l
zCz|%G)F!u(c1xYzA3KlEL<KQzTdD0f6g_TUh}%srjqq|2D0X3UV%oG)L+)I&ooi8_
zSQ``{taBDH-L_`h>z^H1;8+<aENxVA3EsWGJ9W(wnKan+WU!v+ewxcb@pzEIwME>O
zfovE4=c!2D^>da^q{yk~<`Z4H!(p4PusfLOpY6_S>Gvbw$|MPBbu3{^rz781A=(-K
z4=i~myn3Rwii<zo^3=D2oLOxZX)7fB+QXfS<GD*j<wBa*<(C5IcH(^90pLpLG$KX~
z7;C=V1ZjKu3F2_rD<5W3Obc6PftXNz2+-C3K&mGei^FbF9|O0w%kDD)TsmQbkXLlh
zJfhC_E{@!$&+a>acKN7;n2sS*w`T-3{aev~UkuDO3i}vTAka?BT!@8a78PNEM|nXI
zCIK4Ki#X=JIKPi2cTh;V)3H)WU)%lOnLkumlAiI<oB7m6gOl0!XkX~AunAb%VH3xI
zJ+k<h?V~R-pnzLGZW~y&6SeMrtjUH@nm|mrdE>cBKG%9CruNqI(Gt$@xcs}TUhtp^
zlF=7f#377H?H<sN+_`fHy+p8IXbW)LV6C^r(xpM!XZR&<l$U)|1Z@o6Cm>1+Yp;%|
zK0^GU#`Up7OB0x;uwxJ$bIPRny@pwj7Pu^e4m;@E6F=qG^_^C_k9AZ8Pvnp&!Cu%~
zia|VCm)#no<K<iGNET3?gH4bLIZijf2-U`e10(I`;Y;X|P-hkBK5?)%>R7s5TG5lI
zrQPXv*(mx?i#qNuC@N&t1|8q_23H6w7@W4o)OOMva!$R#rjG#UU*4dg@AlK&55vu2
zJh^E{9lPN`?MzDHt(GSxOc_%x0#;R5S#(BMSGPngI{YmYQc}*mC2^vXy?2gDL#!J{
z$N5Fjs{!zV>Kuo367oE-C~c4;WZE}`K1B9NP+{R!EKqs!z1-H{YTB$MI`QZQ>?a5L
zm(Sg_A{KC9eMv{G21buQSz)x~p%VhJ;|JPqi7n}q?`D*`3kfg9gPS!UUk;K95T&i_
z9uAvyqtGw6U|#ou-QT^PCYKEpz8Y9{Eu|Z_8v@ww2Leds(0=XfIm(I!MwNWt&{D^I
z^mr96<CV6KJ)$Mz8f=%Dm^=W__kpPrw>7_jVW%mjS;8pST0QoA&~f*-&6e8gwDrP`
zs^220Azi%ft0-MmNrWXAT_YPOk`|=y3lrnetcQ%&2`{FsS0d1ggqwxJN3oyNGUupc
zt8Y7d^u{%vqVh};CU7}Pf0;g}y5SqiNCTHTQt0WOYc9KA&v8z^&jVpLreTOoE6kY0
zoq~M@=6EM}H6H$C82fsFx~)7;uT?(l0ahoHPvxo8NW2ryOpqW1D+{2Zm=Gb*#s(Yh
z;Kds)_lB!AM)Lj-Fa3F=ptmp&Syw{k>HUgs7qpd509{B3lvK>{T@V3gGmJbDFp^K?
zAR3f9Gk;eC=gh4~qp+0_ZJ}__`?dsk{EB|jFQ%;5#sj#HF;BYnbJnsZ{7Rh7L0GX}
zSrl<q0Jjw)K~`SH2-7eJD_5x)#}&}%^=HA!MpFXHq%^zMqKn!lxWpD2%3mLZrBe+$
z0Da$;y%hB=r0|5D(xAQArn%fc&gA{hPuu*rB4k0&W8aw93U$newisnh0<iQD6a1}B
znWrZiE?@RBEg>U;yaD7k(zA;C%y<>1ao~g<qU~P<5x6$-LoW&5Pe|ee`(&q!=^7ac
z8=f_dLVP%EHx8gXs)qS^X>4YmutAy7QVd>#VKE)p{)@mq`3(nfjffCXd7c8*->D5N
zN%hO8Hz^b@Vs6kzKE5Y6_)han1;K48Se8Xm0JH-`+odauE1`@dr&0a5H{I@O8F#v6
z<`}W@E@|H_nWu*{^cq5K_sTSz*M^O>K)d-_VKLa|SOt>1KU-uR=-<TE^TFHS)yhcN
zNbqal4KP$T=!XY~r`H;J5iO8r*pbQhflC~JQJg!aD=<RoMt5MH+fAS}Fq|IQB$~N{
zQ&;B~1DaQF0mAZUR1?Sm&778gBq;p4KK=a*g3oE7T_5&bnGe%XjH-$^??rt1%cM`x
zlSaC0HA#XOx14sz5+3%?zW~<`VGZ`L(iZ}5k<JvPE*LSSk_nRn8d5MRS)r_eoo&FU
zLAUh>06cv`0A0gNVc;pFi(n52?74?YQJl7C62JQyG`BmMt_aurBPNQ2vMzitN|+$u
zZ#Y@hDG_6A9d?h*Z83r?o$%7iUnKJwC7Bf37_s#aeuulHKv#mt5#{VA9kF!nh+^2F
z_ZRbKiA9AGsu-{g5+l$a-dxasBIFhQEuZtSm+nuPIt!2lTou0bar!3`urdb8Xb3ia
zr0sOYUj!NJhZ3YH6eN2)=n{Qzo~aOmMGte2zbxz$YGJj+aFzzmz6}p)C%2a&C+I`x
zY!v?@1fU8uJm4%ru$nF|2HQmQJN<v^>F`fBT{&tlwltKoAdEIIfQxY%1%<Psq^<O9
zEES-n2b(VcXE+HKI!+H?d3+0KSHt2wxL5-<3pyXvr&?h*;~#?KG9PL?>=&S%rJuM-
z*TDNWu0NjrCGy3662ig*CL(r7E@Np>(i4!B+dEI&K<fndUzT$ME(Z`>DG^xp+&Yp7
z+RcgoqCDsZP^iR$X;B-6*mcla@n?CCI-ukU<bQd+RT3N4j%A%L$b(juzi8PHrDd=|
zc>{1I<IdVsxrT`IXx;%+C6L|yMEW6=g@7D4!7xb8PCE%V7M|ApMR>d@;k_UbJP+@+
zBnrGy&b0nz(a;2c1p8peQ}lW+v;YWT;c^=rt;{kmblCu<KRp9n%wdcJ-m=WUKe}AR
zTVo$@*q_it%w?D*lJpN~-M_Q*t_`#h{&e)HItYqD!H8Bfv%hDlY;bpssT~s!bw-}_
z56F_?tC9kYa5glEP?YIM=$EBK`6SBNXe`+KmxN2Tg?mot_2nCY6@%#RbKe0~cZJCP
zJ+qaw+t*71)khp2elRC9VqX9C<r=`!BBzT#>CN^0R1kdq5UT74*1@t#zOVkIZy<Ag
zJN?`pT!^csa-~I`$i4{-{Odj^4)$4bj|Vv{M<EQVBphCHC;U70V(lnk9146u1WDm>
z%8JuogaCa%lGaK&=N}73>zWGS^x^BTPsc%%5n4P$CE$$p7hWWL`iF4feP%EpD6XUd
zmAtQdb$5;bA)tFd_4(_I0SgB&dg=~Eb8<a;ueAnla>y+_1s4&&ufUg}NPeZ7aT@yu
zcY}}^bZdYka!_)La`pV`%vu9ZV9x(9mX!2uV}bU=?$zNU?6eFi!dcKt`@tR;rrbZZ
z@GA+bLHrOU=uRSrN5<1-?y#f*`g6SGZ+Lp$h4DDf9=B*`{`+6X81Wl^&!r7`0g!Xz
zw@(IlF{6(@0v&@grMs|u5!w*~RWkdP6%vRY=;01HJOoaqTxmj8@7?8U(90V(ot*}H
zk3hHX*+1|1=z-@*>H&?RVOvK$K${02xG|-d&YlUbjI{~8js^TQX?APBI`Z<@IwPob
z#I+oV`8+6$n$h57&KDsxy|VK=oj*snr8ztnqxj3r1V2E#y@}0c9xM+zlgk$&>>T23
z(EmBzS!`N*=+AIK85xxmUPaZ^E4mj1a<P>S%DTgXGoVLNF{R-mm)t$1y(ys5OslXy
z^9Nsl82b7#FFJncPZA!&%ce9qS@6bMFsFg%(OzMAri0iumMt9sZ6h&v(gM(h7%lf-
zD!(v2N&+_>0CfUucsIIsLW%R+9eCO?A%wv`04_TOcx0D=`&rPF{Q;og4kSmYQlw)5
zgN>e+XYYdJ=NRKyaGW3v`kVE%A_TxK&Odu{K%8E`b06M=J{NQheE@o5#g};mE+v91
ze)wKFPn~z|?7$5iZhWH$z`fHkG5tjvLMQ0iugBQR3QLRO0f+ASmb6muQmj~9N25b|
zaQX=21Fpa~Z_4T8ts3gL)a>RM<((T~H4qr+%_|CUZ9lyqJ-Ew|KY|WiiL8JDix&@2
zhrpU9DBLO*m4Z(MIIqfFLL+O09CJ^DZGQiMg7GA^dN3hQmP6YLZiH%swsFP*d*IGs
zk9BbVb&1{nzraIq-&<VJ1t%E_<3gS~ApOGwPA2n-3v{F~Bd`BB@!Xd;&~t_sl!C$i
zlXF_>zek+QC_Vrr`#SVFLe<(RvL;vyUbVQffSc~VcO7JKkZRU{)CS?O3Y>lYMavg%
zqT~LJ0@%?U0=kL1hxamV76z>wG0Cg;+!CYzNiHxvZf<bqWlN>8uxgTfulwD28rdZA
zbSVj<hQRZ=2@fA!4rRaPCfzAh@cy;%{Eds0ud#366EdOYm<SKI;19^;d8H6|0XeI`
z&}sCsiFs}sw-M1DNfBuiHR0tjzMPy|7bmgMu}17eB0%5ou*x(_tY+8nIcbvzi=Ha>
zf{>?wnI|fq2!og+ET*aO<-nCW4Jc<^>0QXM(bV?zA+w!K58*b}>yPM9YByTmxtqp>
zc}avfmw7hp{(#~qPPCbW{~m?sa_H~i_8(D=hG=gwR0w>0LUBaQp2&Tjnik#bE@};o
zjQKWg!C#%<juoq#4e83S*$~PIi`{rZaLJ7j70}&5P<QwHnlgM40eY?|=5eYPSTi_^
zH>XFGWT_uJRh++_^HRCBt?z+zS83CI2cq3@>n`1>E6UpnXzl_3O9j{j`ul3~$iWUj
zG8K#_g&wEpKPR_cMJP}+vob)p-EHZ(8$*rLZM0WrIPU0tO+&1GC&HBgPv$hGNR6fl
zikBRWq<G+b_3F;Q)t~4`q$LIq7fU*aJ8s#q+SlJy%FIc>I<d6Q!@#!1u@^B?>SVnc
z_3mw>PA;Fl-dIvQ9w<A%07D<AM{g9hS@DBGmCKyjivWI0cf-qxcea9#xVm}`q$HI(
z-K`rJk6>pjGa-$n-U<(eI%tS2Yg#DEy`1JkDe{6qSWNn{A{-Xu3HrPKGRc9%?W*(+
zYbh382=$@o&nw2=xV5EjDKbxXod#TEXzHn~ElStg**axs*D=ex*em*Y?D`RlRr7e=
zs{ZwlUZtC_tJWoqjEw#)*dI|4qluR%#{{fAyLesT3T=e7GgJN}!IuMODz^sMxPAFH
z#nr-j8QIiA1CL@81r6#gHP(Wgbgq_<HkWhj_LQo)4|~+e>b;?;+}V2SW`T5fu$YS`
zsl$D?6>g@tKItshziZ4ha2%W=&d58=VgDJ&ul=+hl|4eS?i-p90J^NmWV>>ds`T$B
zh4@iHM9^`ip#2y0Vc<iT0&(|Aw|we|F}B0JO@iCrdj6a{e|%j2hf9A%_zC)5f&Caj
zP>zjHqhA<N=z%fIwovCl_NKy=DRIk4O$-kj#T!x-8Zj=wI;0R*X00ns3xUIZwmIdu
zM{u}HUs?3kN>w^D!LU8ipN(Mozz8m|o0>G-c51@^rz?J7k!PO1evK*C-S63P`a3ub
z&;~J1qrP30bPxQ`mlU;3c0L?_WdaSA;=9ZgQVB+?|J%Ys!KsJ!&K+FyCr;o4sP>Qs
z#>U>jRRG_QwkL?$MX7-o1l>so7WL0arDUy7;T*%6Prm(2gZw-a5)!V3m47y$nYM%1
zE`lDhM+KI1G-p5g_Tg29`&U+4xfYfD<+ZGX*Mzmnx1%2AW(I%dFVdE*IO&ssfk9FY
z|BV3N<WG3O4xrJ3boV!rj0t&;S)gOo^^qab$m;dNSw`|t2%E1pI~mS9FNM@Qg*>4_
z#*BWVLS^#%-c0@=Wodgh$hYpm;u?rxo=^>r8z29w-ujnUuI+=P&3~dwqTa+|l>onO
ziK*C85NPnD$BfdSRp5Dm4drY4^F@{m%_?$I`ZF!rDqOq?m;N%-LB`V-tb3}?Vl>_9
z=rOB|v{@%Jnj+2*<Eh&Ji(4?1leMr&-CDZv?uPe*N_?aWj=tgRznBU3zL{8QtOmPf
ztjr_5a10;u%w|ZM6z`;FWoNg~W;6U5j$;RK^bXsr{7PzGPk;Eud8M?pwVKtCw6<-l
zzr6MX#Ssq;y2EeWG`$y;+FySBXunUPb<;Nz69$)@59FY=;7{Q!{{Sp*dd1uvqE0K<
zG=;uc&wA+V&Ks>vPb>c=;H<!vo}f=K|M>AEG0S5)>)!YAV()4@jrY<fI&pc!*Voqz
z3h(^|pnYIYO(Cr5Y7i<PxBFsl_K6av&II9BXFoTo-&!M?Uf&}4vx%=jRtTn*wHR-#
z3z^t<*d6k6@I1$D$1~r<cOUm$cwn+Z=Z+QqpT#=?$soRrAl&JMs+mW0Ou&F(^OCin
zk6V~98fs8VFlRr&^wn5f=ZXh#&hOMktF_5fF3p79nn6y&IK8$Gvle0|MY_Tr?Cb@L
zROl(u(dtK7;l2(44n9AQU*=|+=Sfm~*-g#T$)OdMDiVPbtLc2Z#do5uZEd4M;Cd1C
z8Q^yJukmwc6)mU@;ZPOj<w^Xe(bY^O%7s$$kF9SSE}YEY?ErE7trxhZ2~84^`QK=P
zGFnR)qBa-_sc-qzve1T0J7+!<99~#>^4zEP$xLd~C_P(CN5}Z#9xO?|ovLulo=y2u
zpXvm*e!I>c*9{&kM^^Xg^vCVfLJv4(;~Fg$<;OdE7m~JS^tQ`uaIgURK*i)21e@Z(
z`+j{vusC%^sUU?^9)|dg5fda9ZBEMFP7|)JyjIrLm%Yo&DcwwGz=!V~Fc-1?*EYMd
zruunTX1gBnX_%Fmx8=@^<6j^%9phYe$6tAW=w_{{lwz()u^0R_q<wn9paqz~Rm!7}
zc*t&ip@?+gf9}@rU!t$-$5%ihgFjU6T<lYwKe%(lgqWXId+!>hxAzPwJ9zzo$;qOp
zmcj$%WMWF-&Ewvtg~kejBATjjvs>1KE1#3RF69jBF05`TM}=F>BbEcA2K<ns0*bo>
zTL8JFRKJYXiXQ9RR7cvNAD6{Mpunl+IwVE)r>Ij+WA|0>JFk?P(?&$NY;Bo$=S~c5
zwg{}>0Y=K-KEc7gn~S8d)!EFXrVa07){nB0X4?J|NX)q!_o_(WGID#zB7}cr?Ao;y
zF(aeon_&M3oMoB`4KA$2#C$HJ4)(W*^<IWdv*xe`Q@|e=_H4+&=PVrv8l@qT>!659
z2AB?r=->+kb@)vaD~9qQ=#M<#55R1c6`~>p6j;EQfrt#g4gzz}3Hr+7l~DJuIrdKR
zzGkveA*dBSn_2rRh%5Nf%%RY(pM6JFT(wwGSW~6gLT_L$4t(GY+Nh4&bd_t8KT#ga
zNzb+m+hrP0QK5<X^l<>8wiy_Pnh2_gpf5eZbP1ykEBi<l?j4n$+^K~a^OZs>tlnu=
zjs<BBLO2|R5M3U&T1nFpDTcOtq4o|U&LnQWWLLm=Jx-?HHovTmgm=#ztWB!Way{5{
zo1H0~{|;DNc8w8HK_VOrC5kV6>BE=cQzY53tb1vD4n*Gg(p|IzU+|B`CmLt|x;)Qu
ztEnl<1j2`zoy^JArrJYsHnq(!+`lGGNq~<YM34752hkt2uyUadD?K1?AaWgRm%TC6
z(#`!Ve{-a>{@bt<@IkoSHuu4g!9zC^2(=JJ*HdFky+zN*dC<*jcj_-U7_2Md!sp;-
z6Ntlldms0`QQ<qCoiw0{@1`qJSLwOOUc$9|3(s|@-&>8l+4~>(G_(-IdQ*}(`wNEh
z#duzKBbIw@9XG}CT%AU_sj_T(mHUL@b5N<#m02J7ChCiNpGznAxV48V^Gs-3A>Z!I
zymAmBSm!{*%cm7Sg%6`-<ZW+UwoJ;a>F)MkK^|!Qv$%3*w5$tBUD)|nhdwE=jEZAT
zE`8n*dgx{J-8|LGdm%fihxx4UN6*2^6$bUYzKl13u(&%+$5jmsduQVyh)_P)N@F8t
zf|o8ksq1<g--F$(TS+w6LboQ&!0AaRkNNasiedM6y`N9VjC@&>z>Zw{+{Vop)73Yi
zU{&h7r_9a8cem4%ZrU<lypZ~ogi$~EM7RCD;_MjKl#_Bg`?<v{G_Un#^q%Dl%So~)
zs!+GL9-AfQHu>Zp)7Y^Wh|IKJq2a)U@1Z2G-AY0<u|c0}?`}xgEgfJ|zmlxRP;RQ-
z92dxCv{k)_O)E^0UGzNXA6*+J^01tBYYx;uU<BX25T>kBYkHhh=j&-)dE+p?1aj6r
zk85XV_vQwdG@R-)Zcp)P2D``HLYSt#s@?Wx=mQ^NieBv#T&4DmccgOLE2Ck&8re;{
zZl$(2Q(Z=Ct{5xJP7YSS?1<}I>Bw8PTN)R@#HaEUO6$ZvV$qz^9Fk%E&SeRz;Qt#a
z&KTrZZ{4dae0|Tv+2VGS>x|!@S}5FJ^&@M32D`t+9OLvqN!~UeLyoPRHT&7NYqNgk
z0+Yk!YdR;sexC1hKeK#_awk6<aOnTlU0{NH`Y619@<ng;G}q$A^%vn5%s&at50%M}
zZ_nIYH}ht@S^nweg44`Rr#UxQZQ8iivUuB{&-UAk{N$nyjrmP|Hf!Cw{Qk_T7SqqC
z^IcYM&jxNjfrK)MhWH%90u?Jz07}ph018qF03}`s7*$C1-~ly)AOKWCK>(=N1Oeb=
z1!00(N)Rxra1aC!xD*|Y4^RjUt>iiyaYMA68I8Enh=UZkkS6SC;Y;hncQnV1=D5)u
zN6&I*_~p0*|F>ncgL;xY&3{&wH!6#`gTr$IJZB9*mV*+!e=^Eq80?|J&<P%+1*J-C
atm_O*`@in@S=w+Fq{7qH&t;ucLK6U-(Q60*

literal 8324
zcmeHLc{tQx+do5EB&kMJGO`a+%9=ff8AcdOB#}zikTqM=W*LPUifl24h%AvcOA9Jl
zvxKaPY}xl^-tWwKp6h!5c;4%J|9*b1%QfeF&bjaVbARs7xzBed)Zl{lKGvhG0DyfM
zv?dOK-O&Gzyxq*u%<nliFX-d80oE8rrBbIxx4sl_7AI|_1+7QjTEAzy?t@u(QC>^%
zU2pxkIoz|kG*7L5wRz8E{Y%m2)F?GAXd{QT(fVPNV6#5lL-oO|4R>!5uC5m+ZT2*6
z_B3u*zuFk?*=qf;)zi3@LxRk=e00`(nzmX$ZYB6`5IT>W1Au72XsR3gz$SZHo_)~a
zU}-*okZ^?W%-=HV$w2RY9(NlmbpKqNHjde01R?$B?;i&KVc<V75cb=lw=jO=Yr1n$
zR>8ddPEdWTv~M`qDXzi{2C#*Sj&t6}%T%`5p!v67RAm=nz<@*aAuF)HzbX9ki1%zf
z0Bgb`ikCHEKrM7gF>6H#;Cmyr%O-!_gjO_or<&{Z0l0j8ZbzrwEHl7o>7`>0*?}PI
zb21xfcA2~0834ecKi}F?_W-PGJSq-=ka7uWUkxyz5~lp=8w`|d99EoU0y9&FwWa$(
za+BCv>{(#_S**yA2^dhCQ}zHh^Di6#&yUKVu>8gens3NNz<^neW%eFWU8P-$O4to%
zrUyrvf!&+f7yH4$Iq|Y^b0(1VCf1e}3@Buc+k^wW$zk_!IQU^}G9kYQSPy*sybHK~
ze#P!~5LB~eqG90r4XLvL4-G=#^bflxk6~tTTJsVDxH`6*C;;n36X$D?qn56`+dwVG
z#PSml4CtG;-$~dBPNN)x;J}W}KbjdVnYUc~b_nEsCLA_o1vB$*M`{32MbMDvl`l<0
z+;A6=PK@jYK8BPG0PNt%uQ0F|MPLQ^&TQ+)cbI{f^I=CW82Hm%7)9m=GvhtXU}dyQ
zrMnoSuEz7QkJYD(0F+6%9_R<4q(18PkRkxy2U&o@`$VWp#(6QK0MB}>TdCELs|tWT
zyRE-6KLI|7Fncm^FQ~Tp9NHbRq6~m#{GoUK6{rJ1ErSEH*rO7(!Q8NQ5&&T{kDld?
zlMTK60Hm+~a5*(E(ml1Zdbo}m`1q}@tXvNCS3+KZ^i~}+*=yLEAjT1NRSR~B#Uy+*
zX!Dfx7m7_9>GHSJuQn~F3z%Oa*O)nB|3RFzX{8!%`#9O2Muq8sNUQtHeF`_-<Jaa+
ziy359VpMhB`cB^!Z(GYYG77S*B*-u5t&bW!R9NPOsqw^JS40fUT%Ect_TW9L=BwAf
z+-Jz66*l&BVc#W7a@v)+ff^6a>&kd`Z)TX14W^?$zBb3iEKNJAoX=&ir2Yd~GWQ?-
z#ac;Dcll2$xj1Lb^e#I?9M|w6$z@+HX0RZ_bzL>*<cPdz*O$5ulsb_&bMKpA&#_ck
zG8bfb-utr(cm5APztSSKkY87n?gJROESN6&`Re7kh8zQ@$N*2HccS_`y827t?&p9S
z_Ck2kZPS#By}I&M`|3LC4Qp@60<d|9d_SHon#)OPF@r3BUjo>XtqpJX|H-1nIR`Xb
z39txsxf;X38rR~v9J!m%eT}lN&+}%s#>q7({F(m1DKO~42IP}7PG1<|F|AE&tISN6
z!hH*CGvXBcdOHTW3xwD|eR(XHwY*~0YW7BYB|4vlbu)z=C<q<!fzaR&oPA&Q2ixl-
zc)zgRY2`vTo-$8rIAK#c2FaMI##!T0!06E??Q0cEnUCSfpA^j(`YJ-dV8E$&Y%Ar%
z*5<B|!T#b%mt}wC6F60|^pkvi;-=i!T`OxEhk$5m#^8vNK+V#r$;#+DZ;i2dul3_4
zedq%Pm(ykZ;u0@sKiLVAC&eR9<vAD5!B~hx4>&UBllgmp-#Z5QY+Gy-Lf~H=m!4E8
zs=Hh^`EdHOraH2}!wDr4rC&VtbMw?}<9w_a<_t@JIdhWe$jjv9OQo8Fs<ljDO+==P
z%9Vtk{W;d_sUa!E%E}1_+=+J7M<Tewxcg~MlN0effVGw28q$~p8J7{7@o8iVGer`A
z2Y?V^!DCvJa9mcIZA6{zii}KsFx1*44o*dh6UhxXEc-uQu9OGWl(8^oBLA3b_wDE&
zwnX7i20k#rc4}N*jsw|xrR!pn`1Pez>|o|+=6+p$%IWOMLk;lP>5i)?0IWJ+AvlTr
zQ`}}p*lmR~xd47pM0pXbPVotB)qJwl)byKc7qHV>ya7LfThK4vxL1qCNr2=#hA!-S
zvqW-}@WK-ZwR8Y3DLaj%&!Agw8ljJ#?Q&)YY>B?oawu(rN<7lXnE4C~h!mZ)`9d6u
zZGdmQ628s~_zZtM`K?7574aPSs6kGSfde%Bl~E?~L%r3MT?xAoX4(dT1z*8zv9q|6
zFZb&Cs6B>8HryOwpm^NE>N;g6in&~CD`pV0&u5w$l$<@A-^uk3MZj!^lung3K(>N}
zhn^a4#32*q=R9qnvzeIyj|_8uA$m5ulE+=Q5Wxh{`IAm^PdSl6k}-##G(C4Jf`PaT
z^D|eBDctSxc9=r;#snrH+@RSBha<b4yjW|otk(eEw7^YN1jnX7-h66qdJXFv0|OtU
zMt-HnqNTF5-QV=^F3q0+_>3dwLFf5V@eL<mUK0+`0{AP%9+|%eXWd?H4b4i`u9A-t
zZfFux>V@VP6}W0A0e-8ce#1=p@`H_=FC7(Y!fp+jX;Qcg%-g-kf41%h)~TiTNxb*{
z-><q8LN`D7g~F>0tJZ$zI3H&LGrL4AFDeHl{l0m*?oy`=CkL|Zvgx9RWM>Kh=PX+`
zd`ZU=OfPUwchRch{YSf@S_0r@M$_v(p2k~hTk3yP!FiN={AMeZWCke0UBlv=QhQQ!
zMwI8#Em<zV?jmun=b__+`;^6<%_~;+O#t<BC$cx?PCM544Rm7AhRZf@0yF*;gu^Rx
zGPhC{Wk_0<y2=RNtfj%h`8ARK`<-Qu+e~F*VE~Sl%)M!@m*Kh3vV%xA%F+#p?GAR_
zJ?DMmvTDyb$Eo#2G+WvIH3Q{@#yP75m8_4GWV)42q)Em2(Y40{sNBObE7V*26s&qQ
zDs-RQ7^kkhefE3alMsz8+5s-Ub*!;2KaYxWp`70FzCK0yOXtI;{EmJ5M)+%PlqLP1
zXgtOq0x6NF?N#O1wYUe}6*rF|bA031UdH?DPrbAMURUB>H#drY&IDwoGTM2rAIfz&
zT<`?`D=8-EVSb;}&Rb=h#~z=z5;21We`T4w=?&4eq3<lTp-;K;g<I;8lBy=R0Y~g>
z2sBS4Pt;%3^D|H2y-i%A7nb_^7Ed;WZR)%gto_It2VCEZ5Tei4v<@FZPCBk>3J;El
z%Oxk+TK0zlwM;EPGWwj6KL-+f?*p$`2jWR~dhVS_4;hdrxV2)FB}+t0?Zh}Al#OkC
zLmmn4?y8ap*8QpMZ%Ppk-{HK-A(>Jwo(DcUb4>6F=<rVZ?dVcBj(YV6?Pf33VDZ^0
z6_abAjz9vBF{)P(>Lhe1`FGBq-qWLftyOZ;AK<$%`y9IJavfTILgDO(7nd+UlApeQ
z7{?q3tlM9y&$!)K(at2=un*lhSk%9E>yWLN3aA$CUf1?+mT=(M`vm^o{F8Tj-l)LG
zuroWMbnZPXELS$QKVufhFMty7aUgdKMO$gpjE08O$}F<p``sfB-Nxoxd`{MpDelg_
zw+n>hB-FjyvfdkCp=9WfdGm>IS>63}=^P9{^f+CoFy;(OLK4@eE|`in3@skq0mHYx
zD_L!EYEO1Mf>h#h4^<Fi{pjigy<2^Y@LRE4^YK1{<Pl`Gx21-DIK$(26}q1iyXqUS
zOgU=3Abv;^^<O5L4!O$f3IK!M>u;mq8@Yc?p`hIqz9fAh$H#qo?`kK&g8$l38SMO`
zTpWp8K#t&45#8S1Xqa_>SdNI5cd*=VO@hwSl18!7uC5;OU?i~ad_*<$;#%<PCxpUN
zCtW%kcI={Zro;DwcTT+i6(9Rz4kE`3xCOlv$ef6egQr=*iZ7RaYrI~XCLyv<D0^q>
z3OBo)5m0NkK;7I#21AYHX&-x>`f-1@x|uI9(1}y}dR*GKAm=gqKuvX@@L;)jP2S>r
z=2774S#<R8f~oES;?Tk2D_V6>H_F+cv<mQjU2C(+a*jG7@Yg@}3Mj=>SDV`$yrNG5
zz+V$z5MR1r0V9&1Df+g*T@2ikk$<rVJS{-CSUh{Ys!iY{89pa3x!(vIe0KnFAS+A#
zeoIi%QiNgSbonoq0T;6_Krg7o$@?WO@g`7{ITv!>IGr2yE(R%R4%8@-kI+{UgQn>_
zrYFz*v4@~o3f~);Vw$b{DS$e;>@|0Zk~ezsk_s4Tv7m%#5~%6Ri@OsaaBhj8M1UnV
ziqHHKx8FA<T-)utRkkLS$e?Etxy<;l7JAD>^i@%u{JG>K{>qz8;s{`nX8c_U$KCd~
zaYR1$an*MetMx8T0_N|KpJ&#$>9iHJE4!>ul%Ryeo83?r8DqX-@DmjZKa!tGV;#Pu
zr9kpc*fVVkx6r<*`oElh?T^Bc(7XSyP7-={#Eso+#_i-^sstEFp2&^4&Vh8mXr?;K
z3oahvUcj+|l2-Q@D9RrpPQ#1M<>J5GIyu3Pimq0)SO{DlH~Y#fOfc1LW|9@GP;2~S
zG&zuD!C&RwPe|e66K7!qVb9n`r1(*%zStdZu$Mn`0Mbt|>Ia`aA8rSxE-X%l-H%*C
zJO<c(%P}N1N^C`C%yjYwCl4D7*w6>{d`LbVmK1qq-uIw?{-X-$o4^E>`#5n(@8Ip$
z>>z<%GJke}l8LW|-**wulgL_O_2+nrOyK^yo<Bb-n&NS1-%Amk{{bM;=RF$=j}rWy
zENgNh#e$Uy7$&*|a3I4;(a5Y+cq<1IRG)@5FAj>~q)E{#xr1nJ3cv>l<8z4R{J1vr
z#Fh50vG$XitYEi;G&QM0@x4CJ=wW%Wx_tLcuroOQTwA10Mln^W(j{pWE&I&9ai{OC
zttvmE)grwU$TH8(V{gr=ReONr+fKNr2r52(_*dd<3i!M_)dpV_todFhc|f_n>}WI`
zXk70>v^Jm#^<^VhBHmW+6hVR_Lr)_#VXEw}kjq8SZc&)ebMiBNWemanQafj;I|&Zj
zeZvoi2Yc)#ku5s=%Op>RQ&wDH{$cz}8f7p{zIo?_eLSH*8+rwK8RD>ulVpR<D)Usx
znTYdb%3Jk`+3b{-!?fgxBQIfK2Gqp;JrQD2HfEh~hfkbr%q0y~?QDLOks*sr>Uav*
zm!XcHK!Qr`5W=OXp*J~{5;WlzEFsm^n5PvhSo5olG-QZ_-j7%1!egZOVp_7rkw-Cx
zGWaP4LeDfi={ye23a$~D%Eq|(NH*m;lpi{@=ey&Depn+C+};vH6lB3m)l|Jv4LpZt
z#XzARBU$BdTz^D~gp-)6WBCQd1!-eWrXNdE4>sN88Jm<+%&P;>D(TQI{Ku{>nx8;I
z`@rYsglnez<9kzS<~9MqOR7BhmNyX&0Rd(K@Os*QC}6vGWlja%QwP(4(5=j4rz~g-
zHF1FV9f^~U8qX77Qt^GoUYzcCCd76#*ISn!?u<;pu=oqcF3_ps;BRXLWr=}Bj=2XK
z!J7yV=+M=S;CZTnBzj~!!ojjZKDr}UtpZmQMh?=b!0nM(bAnB2nL6EzK^P+6di@tY
z0jBC@71lpH>6q0xRhIMZ)@K=RGSmt}A1U(EsR7Rr#o^nD^-xv~8BCnc_#Cl4sg4RX
zW`wkrUC8%XzdB3z2pXggyWE9%g19Nszf|pG=1)gZy}bX;CSzJ2Cv{7RMn53ioDdOX
zgd>xm(rwxX%0h1_Zm-MOg}Y=~1#X9FmhhwIQzhsbXM9@Z-n(S7om^*1Sd9b2<)WR}
z%eS(OLR*{m*9Ja?4i2q|u@(grrp@qTeLCHCK@B~uaYIWC%$>7^_tQ%P=-$-k=SwoO
zSHu`$<irn4zxH7eZalfz?d6gWMj5q8zTMfI9%0ervK@F`_UD>wjqP!U%Usnu$y=jY
zP?i%IR*+NvcWSAQ=F&_Z2WFgqEJ#&FQAE|Ch~Of&N{8T2=gY=d1^usKH-^AO!|htL
z5JvedLKB#Hdg8xrg7-5(%{X_~Twg+n(%}w_=117GAsE;P&gq$WkjMbS1B`28B4X(L
zo^~SV{S^?V(=VN-&Dj(2oH4&(XdsT9!$6Yb6KmWy)2xZvpFm%p;d%5Jp+FCkJVp+g
zue(5}@ke6n!&3;w?fF#v(gP8?XD2ygZWNq_Cg6eS5mVf76m;&?jFd2p?Cc0qP#_4G
zyjHrA4*g_+vd@Kjj8Rd*@Et6Mp&H%cBMf~EBU*TbYNlx()es8jFhqSCcUch?^mBn{
zDpo0CSkKkLpD^Y&q-vu6J>o-d(b;aC4Sc;#XEE}xPz{3Su{sRe2cZQ^t1gxdWF<}1
zccl#L6Vz2Kqo~`C<F5!P>k?F<2Ec^3`qe9l!qBQGJzb<%Tuko@63l8_Q60t7P$z+K
z0yM!CN2@E78jg()65l<IEhG);Gg4c(pqGQT{PShcF(pqSsMu;#n0&e~G%J3Cs{8l*
z)IODC!caFk1Dxhw6jr8m)HOiD0~uTE19}bmmd*@cd+$h$XO0}H7e(qo`e3r=nwIU@
zpsqmip)~U%sT1BZs%<i80*NNAmBXAbnts-nTW;H~nuMPktIe6c6~RFHXp)_5`6U=F
zgi@guEAaKoX_VZQ?nTDxoj|F0hZtE%lDd$0yrpsZ>I(04hYsNl-8XN0->Q6VIds3!
zpY6yUiilvJDs7BmEJQ09^{L8fMPx(Q&Lf)U@-jWK`Az5(7{fT)Y7;RfYkv9FQ+OI}
zaps^xWt%)DB#a`eM+@aVEdP3FREMFe<S-s9aUL9`bR`<dB!RkBgZ>u_7cquOG*739
zX}WT*Aw1hD?MV>Owdm>=SQDgcHnuuoc$G9Fs}=rhl3rqbL*2m$qe=dH6rHitkERsn
zCP$qKR{Xjz7%WAVL||V!$2AR}c=MP+g#9~Bl%CrU?IbOR4bfdjk7xzAj8mn@nCWi+
z&}g(V$MKxebE}OjQ9^oBnmH;Ar3rsWRnAAI%W4%FGVBv$L{s#l&Up}X=>h=Qj0m%}
zxogWDtKp1OaXQ5^y5-h)>A*4aLoM7lny#z&#;q=C#8rDe=Kt5G%u&%BcagmCDUIkB
zG@+Cx0B)n<3CVgkg1j)4tONZLotucz<*Hd=DBJpWKy;z1O1e{jcd%#%<2d5KRA^p(
z*?ZzfN#RS;SNbHIolw@m!|<p5JIb=%-@gcQp*rpx?V7<iNrmQAIDNnC;@8!?EOqZ1
z30^?EZwIuozYFbEH|z53RHkb65QoN&VWjrcid7VV9UpA#EiNzDkEu^veNb2b`+KjY
zVxP-}0IVaLWFt%q_3o3y@hD0x4IxmqNn6`yd1CxpViJiGOQg-exc0PL5NS(0IMtG-
z8M-7JTbij8541={L)btavM&zWLF=Px?q1SH4Dk%qv@njg8cY$zxF<vh%nc!~Aatzq
zwK_bE4l)oFPN2PYKyNnHT8!m6n3Mj2?Mdt978;{ai-vBIZR?*xy=hpwK!Dz?m)>)R
zdiq)><LS~f<G?os7-#s=NR|*o0=qR%-fsyE#SCb-rB$VG8}AY;6aLK*f?43ZDcp9T
z-`bsmP{_jxaNs}PDMyZFm?kUaxN1t>r9-XOMd)^@rYSK%OuJVpSEX-1^h8h{aZrOG
zCsDvacio&vXEcN_LmUaX*Dl>>WXdNt_uzkx2&_=Q8-y1Zm!?B0pn9RcxmfbSF?F8N
z^QD_MS><@QA2yU~_j#-`(|COL6b_^{xC+K!<RXKidO&^7#N&uE^n<qnXMAz&j~?6Q
zxDIwu65i{fa8(Hg5T7UD=CegzmR5(r%=^pUbw>Gd+|zM8fWKLPV7TQ4vxWHC{RMjf
z-lem*WUOzfs`JI)y56P{#5E?6TzX~NYicu~(=(u-YGU(lG2rfa+4_2ZMR~cb-kQk&
z@oV;f&C-C})O*+-C|!IqHMi$L#>Rh5=Km!6|7Ae!qX^dI7K^Ps%@BjSpqX>t`u_g_
Dum-S-


From 4445e317689a9ddd32b42842a3c1916b669415b7 Mon Sep 17 00:00:00 2001
From: Theodore Li <theo@sim.ai>
Date: Wed, 20 May 2026 14:22:26 -0700
Subject: [PATCH 11/16] fix(table): bump run counter on edit/auto-run so Stop
 shows for queued cells (#4682)

The "X running" badge + per-row gutter Stop only updated on manual Run
(useRunColumn bumped the run-state counter). Edit-triggered auto-runs
(useUpdateTableRow, useBatchUpdateTableRows, useCreateTableRow) stamped cells
pending in the rows cache but never bumped runningCellCount/runningByRowId, so
Stop stayed hidden even though cells were queued (the counter is already
queued-inclusive). Extracted countNewlyInFlight + bumpRunState helpers and
wired them into all the optimistic auto-fire paths with onError rollback;
reused them in useRunColumn.
---
 apps/sim/hooks/queries/tables.ts | 95 +++++++++++++++++++++++---------
 1 file changed, 70 insertions(+), 25 deletions(-)

diff --git a/apps/sim/hooks/queries/tables.ts b/apps/sim/hooks/queries/tables.ts
index afd799e8a08..da557057431 100644
--- a/apps/sim/hooks/queries/tables.ts
+++ b/apps/sim/hooks/queries/tables.ts
@@ -225,6 +225,43 @@ async function fetchTableRunState(tableId: string, signal?: AbortSignal): Promis
   }
 }
 
+/** Count groups flipped to in-flight (`pending`) by an optimistic schedule that
+ *  weren't in-flight before — the delta to add to the run-state counter. */
+function countNewlyInFlight(before: RowExecutions, after: RowExecutions): number {
+  let n = 0
+  for (const gid of Object.keys(after)) {
+    if (after[gid]?.status === 'pending' && !isExecInFlight(before[gid])) n++
+  }
+  return n
+}
+
+/** Add optimistically-stamped cells to the run-state counter so the "X running"
+ *  badge + per-row gutter Stop reflect them instantly (the optimistic stamp
+ *  eats the dispatcher's `pending` SSE, so `applyCell` never bumps the count).
+ *  Returns the prior snapshot for rollback, or `null` when nothing was bumped. */
+function bumpRunState(
+  queryClient: ReturnType<typeof useQueryClient>,
+  tableId: string,
+  stampedByRow: Record<string, number>
+): { snapshot: TableRunState | undefined } | null {
+  const total = Object.values(stampedByRow).reduce((s, n) => s + n, 0)
+  if (total === 0) return null
+  const snapshot = queryClient.getQueryData<TableRunState>(tableKeys.activeDispatches(tableId))
+  queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
+    const base = prev ?? { dispatches: [], runningCellCount: 0, runningByRowId: {} }
+    const nextByRow = { ...base.runningByRowId }
+    for (const [rid, n] of Object.entries(stampedByRow)) {
+      nextByRow[rid] = (nextByRow[rid] ?? 0) + n
+    }
+    return {
+      ...base,
+      runningCellCount: base.runningCellCount + total,
+      runningByRowId: nextByRow,
+    }
+  })
+  return { snapshot }
+}
+
 /**
  * Aggregate live state for a table: active dispatches (drives the "about to
  * run" overlay), the running-cell count (top-right counter), and per-row
@@ -453,6 +490,11 @@ export function useCreateTableRow({ workspaceId, tableId }: RowMutationContext)
           .workflowGroups ?? []
       const stamped = withOptimisticAutoFireExec(groups, row)
       reconcileCreatedRow(queryClient, tableId, stamped)
+      // Bump the run-state counter for any auto-fire groups stamped pending so
+      // the "X running" badge + gutter Stop show immediately (the row had no
+      // prior executions, so the stamped set is the full delta).
+      const stampedCount = countNewlyInFlight({}, stamped.executions ?? {})
+      if (stampedCount > 0) bumpRunState(queryClient, tableId, { [row.id]: stampedCount })
     },
     onError: (error) => {
       if (isValidationError(error)) return
@@ -618,10 +660,14 @@ export function useUpdateTableRow({ workspaceId, tableId }: RowMutationContext)
         queryClient.getQueryData<TableDefinition>(tableKeys.detail(tableId))?.schema
           .workflowGroups ?? []
 
+      const stampedByRow: Record<string, number> = {}
       patchCachedRows(queryClient, tableId, (row) => {
         if (row.id !== rowId) return row
         const patch = data as Partial<RowData>
         const nextExecutions = optimisticallyScheduleNewlyEligibleGroups(groups, row, patch)
+        if (nextExecutions) {
+          stampedByRow[row.id] = countNewlyInFlight(row.executions ?? {}, nextExecutions)
+        }
         return {
           ...row,
           data: { ...row.data, ...patch } as RowData,
@@ -629,7 +675,12 @@ export function useUpdateTableRow({ workspaceId, tableId }: RowMutationContext)
         }
       })
 
-      return { previousQueries }
+      const bumped = bumpRunState(queryClient, tableId, stampedByRow)
+      return {
+        previousQueries,
+        runStateSnapshot: bumped?.snapshot,
+        didBumpRunState: bumped !== null,
+      }
     },
     onSuccess: (response, { rowId, data: mutatedData }) => {
       const serverRow = response.data.row
@@ -655,6 +706,9 @@ export function useUpdateTableRow({ workspaceId, tableId }: RowMutationContext)
           queryClient.setQueryData(queryKey, data)
         }
       }
+      if (context?.didBumpRunState) {
+        queryClient.setQueryData(tableKeys.activeDispatches(tableId), context.runStateSnapshot)
+      }
       if (isValidationError(error)) return
       toast.error(error.message, { duration: 5000 })
     },
@@ -694,11 +748,15 @@ export function useBatchUpdateTableRows({ workspaceId, tableId }: RowMutationCon
         queryClient.getQueryData<TableDefinition>(tableKeys.detail(tableId))?.schema
           .workflowGroups ?? []
 
+      const stampedByRow: Record<string, number> = {}
       patchCachedRows(queryClient, tableId, (row) => {
         const raw = updateMap.get(row.id)
         if (!raw) return row
         const patch = raw as Partial<RowData>
         const nextExecutions = optimisticallyScheduleNewlyEligibleGroups(groups, row, patch)
+        if (nextExecutions) {
+          stampedByRow[row.id] = countNewlyInFlight(row.executions ?? {}, nextExecutions)
+        }
         return {
           ...row,
           data: { ...row.data, ...patch } as RowData,
@@ -706,7 +764,12 @@ export function useBatchUpdateTableRows({ workspaceId, tableId }: RowMutationCon
         }
       })
 
-      return { previousQueries }
+      const bumped = bumpRunState(queryClient, tableId, stampedByRow)
+      return {
+        previousQueries,
+        runStateSnapshot: bumped?.snapshot,
+        didBumpRunState: bumped !== null,
+      }
     },
     onError: (error, _vars, context) => {
       if (context?.previousQueries) {
@@ -714,6 +777,9 @@ export function useBatchUpdateTableRows({ workspaceId, tableId }: RowMutationCon
           queryClient.setQueryData(queryKey, data)
         }
       }
+      if (context?.didBumpRunState) {
+        queryClient.setQueryData(tableKeys.activeDispatches(tableId), context.runStateSnapshot)
+      }
       if (isValidationError(error)) return
       toast.error(error.message, { duration: 5000 })
     },
@@ -1376,29 +1442,8 @@ export function useRunColumn({ workspaceId, tableId }: RowMutationContext) {
         return { ...r, data: nextData, executions: next }
       })
 
-      // Bump the counter to match the stamped cells. Without it the "X running"
-      // badge + gutter Stop stay at zero until a refetch: the optimistic stamp
-      // already marks the cell in-flight, so the dispatcher's `pending` SSE
-      // sees no `wasInFlight` transition and never bumps the counter.
-      const runStateSnapshot = queryClient.getQueryData<TableRunState>(
-        tableKeys.activeDispatches(tableId)
-      )
-      const totalStamped = Object.values(stampedByRow).reduce((s, n) => s + n, 0)
-      if (totalStamped > 0) {
-        queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
-          const base = prev ?? { dispatches: [], runningCellCount: 0, runningByRowId: {} }
-          const nextByRow = { ...base.runningByRowId }
-          for (const [rid, n] of Object.entries(stampedByRow)) {
-            nextByRow[rid] = (nextByRow[rid] ?? 0) + n
-          }
-          return {
-            ...base,
-            runningCellCount: base.runningCellCount + totalStamped,
-            runningByRowId: nextByRow,
-          }
-        })
-      }
-      return { snapshots, runStateSnapshot, didBumpRunState: totalStamped > 0 }
+      const bumped = bumpRunState(queryClient, tableId, stampedByRow)
+      return { snapshots, runStateSnapshot: bumped?.snapshot, didBumpRunState: bumped !== null }
     },
     onError: (_err, _variables, context) => {
       if (context?.snapshots) restoreCachedWorkflowCells(queryClient, context.snapshots)

From 48cf200ccdbedf857188b3f66774b21d3230327d Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 17:52:52 -0700
Subject: [PATCH 12/16] fix(helm): allow host[:port][/path] form in
 global.imageRegistry schema (#4686)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The values.schema.json constrained global.imageRegistry to JSON Schema
hostname format (RFC 1123), which forbids '/'. That rejected the
host+path form required by Artifactory virtual repos, Harbor projects,
GCR (gcr.io/project-id), and ECR-with-namespace — all of which the
chart's image-rendering helper already supports (it prints '%s/%s:%s').

Drop the format constraint and document the supported shapes. Matches
the bitnami common-chart convention of validating image registry as a
plain string and deferring to Docker for the actual reference parse.
---
 helm/sim/values.schema.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/helm/sim/values.schema.json b/helm/sim/values.schema.json
index 146d74b5638..1c7504b8884 100644
--- a/helm/sim/values.schema.json
+++ b/helm/sim/values.schema.json
@@ -8,8 +8,7 @@
       "properties": {
         "imageRegistry": {
           "type": "string",
-          "format": "hostname",
-          "description": "Global Docker image registry"
+          "description": "Global Docker image registry (host[:port][/path]). Supports plain hosts (registry.example.com), host:port (registry.example.com:5000), and host+path forms used by Artifactory virtual repos, Harbor projects, GCR (gcr.io/project-id), and ECR-with-namespace."
         },
         "useRegistryForAllImages": {
           "type": "boolean",

From 57b9a2fb3887db5915898d1d24e338112deb36c2 Mon Sep 17 00:00:00 2001
From: Theodore Li <theo@sim.ai>
Date: Wed, 20 May 2026 18:55:27 -0700
Subject: [PATCH 13/16] fix(table): typewriter flash, Run-row completed-skip,
 dispatch-scope running count (#4687)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(table): no typewriter flash; Run-row skips completed workflows

- Typewriter: reset the revealed text synchronously during render when the
  value changes (not in an effect), so a cell going from running→value no
  longer flashes the full text for one frame before animating.
- Run row / manual incomplete runs now treat a `completed` group as done even
  if an output column is blank — only "Run all" re-runs completed cells. The
  auto cascade keeps re-filling blank outputs (completedAndFilled). Client
  optimistic stamp mirrors: incomplete skips `completed` cells.

* fix(table): incomplete bulk-clear is per-group, not per-row

bulkClearWorkflowGroupCells in incomplete mode wiped EVERY targeted group's
output data + exec on any row that wasn't fully filled across all targeted
groups. So Run-row on a row with one completed group and one cancelled group
wiped the completed group's outputs + exec too, and the dispatcher re-ran it.

Now incomplete-mode clears per-group: only error/cancelled groups get their
output columns + exec cleared; completed and in-flight groups are left intact
(never-run groups have nothing to clear and run via eligibility). Combined
with the classifyEligibility guard, a completed workflow is never re-run by
Run-row — only Run-all re-runs it.

* fix(table): X-running count from dispatch scope so reload matches live

The "X running" badge read countRunningCells (sidecar in-flight), but the
dispatcher only stamps one ~20-cell window at a time. During a 1000-row
Run-all the client optimistically showed ~1000 while a reload showed ~20 —
the sidecar never holds more than a window.

Derive the count from the active dispatches instead: rows in scope ahead of
the cursor × |groupIds| (exact for Run-all, upper bound for incomplete/new).
Both scope and cursor are persisted, so a reload computes the same number.

- countActiveRunCells (dispatcher.ts): dispatch-scope total, sidecar fallback
  when no dispatch is active. byRowId stays sidecar-based (the client overlay
  renders queued rows ahead of the cursor).
- Live: applyDispatch re-syncs the badge from the server on every dispatch
  event (one per window, after its cells finish + cursor advances), so the
  badge steps down per window and matches reload. applyCell no longer touches
  runningCellCount (still keeps runningByRowId live for the gutter).
- Optimistic on click: useRunColumn seeds the full run scope (totalCount ×
  groups) so the badge is right before the first window lands.

* fix(table): address review — parallel dispatch counts, unfiltered rowCount

- countActiveRunCells: run the per-dispatch COUNT queries + the sidecar count
  in parallel instead of serially (one round-trip per dispatch).
- Optimistic Run-all estimate now reads the table definition's maintained,
  unfiltered rowCount (detail cache) instead of the rows query's filter-scoped
  totalCount — the dispatcher runs every row regardless of the active filter.
---
 .../api/table/[tableId]/dispatches/route.ts   |   8 +-
 .../table-grid/cells/cell-render.tsx          |  32 ++--
 .../[tableId]/hooks/use-table-event-stream.ts |  27 ++--
 apps/sim/hooks/queries/tables.ts              |  53 +++++--
 apps/sim/lib/table/dispatcher.ts              | 146 +++++++++++-------
 apps/sim/lib/table/workflow-columns.ts        |   9 +-
 6 files changed, 170 insertions(+), 105 deletions(-)

diff --git a/apps/sim/app/api/table/[tableId]/dispatches/route.ts b/apps/sim/app/api/table/[tableId]/dispatches/route.ts
index a5e442f05dd..7682ba82994 100644
--- a/apps/sim/app/api/table/[tableId]/dispatches/route.ts
+++ b/apps/sim/app/api/table/[tableId]/dispatches/route.ts
@@ -5,7 +5,7 @@ import { parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { countRunningCells, listActiveDispatches } from '@/lib/table/dispatcher'
+import { countActiveRunCells, listActiveDispatches } from '@/lib/table/dispatcher'
 import { accessError, checkAccess } from '@/app/api/table/utils'
 
 const logger = createLogger('TableDispatchesAPI')
@@ -37,10 +37,8 @@ export const GET = withRouteHandler(async (request: NextRequest, { params }: Rou
     const result = await checkAccess(tableId, authResult.userId, 'read')
     if (!result.ok) return accessError(result, requestId, tableId)
 
-    const [rows, running] = await Promise.all([
-      listActiveDispatches(tableId),
-      countRunningCells(tableId),
-    ])
+    const rows = await listActiveDispatches(tableId)
+    const running = await countActiveRunCells(tableId, rows)
     const dispatches: ActiveDispatch[] = rows.map((r) => ({
       id: r.id,
       status: r.status as 'pending' | 'dispatching',
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
index 7201a3f7d23..48cd6444806 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
@@ -303,25 +303,28 @@ const TYPEWRITER_MS_PER_CHAR = 15
  */
 function useTypewriter(text: string | null): string | null {
   const [revealed, setRevealed] = useState<string | null>(text)
-  const isFirstRunRef = useRef(true)
   const prevTextRef = useRef<string | null>(text)
+  const mountedRef = useRef(false)
+  const animateRef = useRef(false)
 
-  useEffect(() => {
-    if (isFirstRunRef.current) {
-      isFirstRunRef.current = false
-      prevTextRef.current = text
-      setRevealed(text)
-      return
-    }
-    if (prevTextRef.current === text) return
+  // Reset synchronously during render when `text` changes (not on first mount)
+  // so no frame ever shows the full new value before the animation begins —
+  // an effect-based reset lands one frame late and flashes the whole text.
+  if (prevTextRef.current !== text) {
     prevTextRef.current = text
+    const animate = mountedRef.current && text !== null && text.length > 0
+    animateRef.current = animate
+    setRevealed(animate ? '' : text)
+  }
 
-    if (text === null || text.length === 0) {
-      setRevealed(text)
-      return
-    }
+  useEffect(() => {
+    mountedRef.current = true
+  }, [])
 
-    const full = text
+  useEffect(() => {
+    if (!animateRef.current) return
+    animateRef.current = false
+    const full = text as string
     const start = performance.now()
     let raf = 0
     const tick = (now: number) => {
@@ -329,7 +332,6 @@ function useTypewriter(text: string | null): string | null {
       setRevealed(full.slice(0, chars))
       if (chars < full.length) raf = requestAnimationFrame(tick)
     }
-    setRevealed('')
     raf = requestAnimationFrame(tick)
     return () => cancelAnimationFrame(raf)
   }, [text])
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts
index 7c00d06e338..b56f64a8cc1 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-event-stream.ts
@@ -73,11 +73,11 @@ export function useTableEventStream({
     let lastEventId = loadPointer(tableId)
     let reconnectAttempt = 0
 
-    const updateRunStateCounters = (
-      rowId: string,
-      wasInFlight: boolean,
-      isInFlight: boolean
-    ): void => {
+    // Keeps the per-row gutter (`runningByRowId`) live between dispatch events.
+    // `runningCellCount` (the "X running" badge) is NOT touched here — it's the
+    // server's dispatch-scope count, seeded optimistically on click and
+    // re-synced by `applyDispatch` on every window, so live matches reload.
+    const updateRunningByRow = (rowId: string, wasInFlight: boolean, isInFlight: boolean): void => {
       if (wasInFlight === isInFlight) return
       const delta = isInFlight ? 1 : -1
       queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
@@ -87,11 +87,7 @@ export function useTableEventStream({
         const nextByRow = { ...prev.runningByRowId }
         if (nextForRow === 0) delete nextByRow[rowId]
         else nextByRow[rowId] = nextForRow
-        return {
-          ...prev,
-          runningCellCount: Math.max(0, prev.runningCellCount + delta),
-          runningByRowId: nextByRow,
-        }
+        return { ...prev, runningByRowId: nextByRow }
       })
     }
 
@@ -145,11 +141,7 @@ export function useTableEventStream({
           queryKey: tableKeys.activeDispatches(tableId),
         })
       } else {
-        updateRunStateCounters(
-          rowId,
-          wasInFlight,
-          isExecInFlight({ status } as RowExecutionMetadata)
-        )
+        updateRunningByRow(rowId, wasInFlight, isExecInFlight({ status } as RowExecutionMetadata))
       }
     }
 
@@ -195,6 +187,11 @@ export function useTableEventStream({
         merged[idx] = next
         return { ...base, dispatches: merged }
       })
+      // The dispatcher emits this once per window (after the window's cells
+      // finish + the cursor advances) and on completion. Re-sync the
+      // dispatch-scope `runningCellCount` from the server so the badge steps
+      // down per window and matches a reload exactly.
+      void queryClient.invalidateQueries({ queryKey: tableKeys.activeDispatches(tableId) })
     }
 
     const handlePrune = (payload: PrunedEvent): void => {
diff --git a/apps/sim/hooks/queries/tables.ts b/apps/sim/hooks/queries/tables.ts
index da557057431..3f3f3cd5314 100644
--- a/apps/sim/hooks/queries/tables.ts
+++ b/apps/sim/hooks/queries/tables.ts
@@ -73,7 +73,6 @@ import type {
 } from '@/lib/table'
 import {
   areGroupDepsSatisfied,
-  areOutputsFilled,
   isExecInFlight,
   optimisticallyScheduleNewlyEligibleGroups,
 } from '@/lib/table/deps'
@@ -235,17 +234,34 @@ function countNewlyInFlight(before: RowExecutions, after: RowExecutions): number
   return n
 }
 
-/** Add optimistically-stamped cells to the run-state counter so the "X running"
- *  badge + per-row gutter Stop reflect them instantly (the optimistic stamp
- *  eats the dispatcher's `pending` SSE, so `applyCell` never bumps the count).
- *  Returns the prior snapshot for rollback, or `null` when nothing was bumped. */
+/** The table's maintained, unfiltered `rowCount` from the detail cache (or
+ *  `null` when the detail hasn't loaded). This is the right scope for a Run-all
+ *  estimate: the dispatcher runs every row regardless of the active view
+ *  filter, whereas the rows query's `totalCount` is filter-scoped. */
+function readTableRowCount(
+  queryClient: ReturnType<typeof useQueryClient>,
+  tableId: string
+): number | null {
+  const def = queryClient.getQueryData<TableDefinition>(tableKeys.detail(tableId))
+  return typeof def?.rowCount === 'number' ? def.rowCount : null
+}
+
+/** Optimistically reflect a run on the "X running" badge + per-row gutter Stop
+ *  instantly (the optimistic stamp eats the dispatcher's `pending` SSE, so
+ *  `applyCell` never bumps the count, and the server's dispatch-scope count
+ *  isn't live until the first window). `stampedByRow` drives the per-row gutter
+ *  (loaded rows only); `cellCountDelta` is the badge delta — pass the full run
+ *  scope (rows × groups) for Run-all so it matches the server, or omit to use
+ *  the stamped total. Returns the prior snapshot for rollback. */
 function bumpRunState(
   queryClient: ReturnType<typeof useQueryClient>,
   tableId: string,
-  stampedByRow: Record<string, number>
+  stampedByRow: Record<string, number>,
+  cellCountDelta?: number
 ): { snapshot: TableRunState | undefined } | null {
-  const total = Object.values(stampedByRow).reduce((s, n) => s + n, 0)
-  if (total === 0) return null
+  const stampedTotal = Object.values(stampedByRow).reduce((s, n) => s + n, 0)
+  const countDelta = cellCountDelta ?? stampedTotal
+  if (countDelta === 0 && stampedTotal === 0) return null
   const snapshot = queryClient.getQueryData<TableRunState>(tableKeys.activeDispatches(tableId))
   queryClient.setQueryData<TableRunState>(tableKeys.activeDispatches(tableId), (prev) => {
     const base = prev ?? { dispatches: [], runningCellCount: 0, runningByRowId: {} }
@@ -255,7 +271,7 @@ function bumpRunState(
     }
     return {
       ...base,
-      runningCellCount: base.runningCellCount + total,
+      runningCellCount: base.runningCellCount + countDelta,
       runningByRowId: nextByRow,
     }
   })
@@ -1418,12 +1434,10 @@ export function useRunColumn({ workspaceId, tableId }: RowMutationContext) {
           // dispatcher regardless of mode. Stamping pending here would leave
           // the cell flashing Queued indefinitely (no SSE event will arrive).
           if (group && !areGroupDepsSatisfied(group, r)) continue
-          // Mirror server eligibility for `mode: 'incomplete'`: skip cells whose
-          // outputs are filled, regardless of exec status. A cancelled/error
-          // cell with a leftover value from a prior run was rendering as filled
-          // but flipping to "queued" optimistically here even though the server
-          // would skip it.
-          if (runMode === 'incomplete' && group && areOutputsFilled(group, r)) continue
+          // Mirror server eligibility for manual `mode: 'incomplete'`: a
+          // `completed` group is done (even with a blank output) — only "Run
+          // all" re-runs it. error/cancelled/never-run cells still re-run.
+          if (runMode === 'incomplete' && exec?.status === 'completed') continue
           next[groupId] = buildPendingExec(exec)
           // Mirror the server-side bulk clear: wipe output values so the cell
           // doesn't render the stale completed value behind a pending badge.
@@ -1442,7 +1456,14 @@ export function useRunColumn({ workspaceId, tableId }: RowMutationContext) {
         return { ...r, data: nextData, executions: next }
       })
 
-      const bumped = bumpRunState(queryClient, tableId, stampedByRow)
+      // Badge counts the whole run scope (rows × groups), matching the server's
+      // dispatch-scope count — not just the loaded rows we could stamp. For
+      // Run-all that's the table's totalCount; for a scoped run, the rowIds.
+      const scopeRowCount = targetRowIds
+        ? targetRowIds.size
+        : (readTableRowCount(queryClient, tableId) ?? Object.keys(stampedByRow).length)
+      const cellCountDelta = scopeRowCount * targetGroupIds.size
+      const bumped = bumpRunState(queryClient, tableId, stampedByRow, cellCountDelta)
       return { snapshots, runStateSnapshot: bumped?.snapshot, didBumpRunState: bumped !== null }
     },
     onError: (_err, _variables, context) => {
diff --git a/apps/sim/lib/table/dispatcher.ts b/apps/sim/lib/table/dispatcher.ts
index ab91ff67cb4..d4ab6d8aa4b 100644
--- a/apps/sim/lib/table/dispatcher.ts
+++ b/apps/sim/lib/table/dispatcher.ts
@@ -65,67 +65,69 @@ export async function bulkClearWorkflowGroupCells(input: {
   // Pre-existing outputs on any other row must not be wiped by an auto-fire.
   if (mode === 'new') return
 
-  const outputCols = Array.from(new Set(groups.flatMap((g) => g.outputs.map((o) => o.columnName))))
   const groupIds = groups.map((g) => g.id)
-
-  // Step 1: clear the targeted output columns from `data` on every row in
-  // scope. Identical chain to the previous JSONB-only path.
-  let dataExpr: SQL = sql`coalesce(${userTableRows.data}, '{}'::jsonb)`
-  for (const col of outputCols) dataExpr = sql`(${dataExpr}) - ${col}::text`
-
-  const filters: SQL[] = [eq(userTableRows.tableId, tableId)]
-  if (rowIds && rowIds.length > 0) {
-    filters.push(inArray(userTableRows.id, rowIds))
-  }
-  if (mode === 'incomplete') {
-    // Skip rows where all output columns across all targeted groups already
-    // have a non-empty value — those are "completed-and-filled" and the
-    // eligibility predicate would skip them anyway.
-    const filledChecks = outputCols.map(
-      (col) => sql`coalesce(${userTableRows.data} ->> ${col}, '') != ''`
+  const rowScope = rowIds && rowIds.length > 0 ? rowIds : null
+
+  if (mode === 'all') {
+    // Run-all re-runs every targeted group: wipe all their output columns +
+    // executions for the rows in scope. (Prior in-flight runs were already
+    // cancelled by the caller.)
+    const outputCols = Array.from(
+      new Set(groups.flatMap((g) => g.outputs.map((o) => o.columnName)))
     )
-    const allFilled = filledChecks.reduce((acc, expr) => sql`${acc} AND ${expr}`)
-    filters.push(sql`NOT (${allFilled})`)
-    // Also skip rows where ANY targeted group has an in-flight exec — those
-    // belong to another dispatch and clobbering them would race. Encoded as
-    // a NOT EXISTS subquery against the sidecar's `(table_id, status)`
-    // partial index.
-    filters.push(
-      sql`NOT EXISTS (
+    let dataExpr: SQL = sql`coalesce(${userTableRows.data}, '{}'::jsonb)`
+    for (const col of outputCols) dataExpr = sql`(${dataExpr}) - ${col}::text`
+    const filters: SQL[] = [eq(userTableRows.tableId, tableId)]
+    if (rowScope) filters.push(inArray(userTableRows.id, rowScope))
+
+    await db.transaction(async (trx) => {
+      await trx
+        .update(userTableRows)
+        .set({ data: dataExpr, updatedAt: new Date() })
+        .where(and(...filters))
+      const execFilters: SQL[] = [
+        eq(tableRowExecutions.tableId, tableId),
+        inArray(tableRowExecutions.groupId, groupIds),
+      ]
+      if (rowScope) execFilters.push(inArray(tableRowExecutions.rowId, rowScope))
+      await trx.delete(tableRowExecutions).where(and(...execFilters))
+    })
+    return
+  }
+
+  // `incomplete`: clear per-group, not per-row. Only groups that are
+  // re-runnable (`error` / `cancelled`) get their output columns + exec wiped;
+  // `completed` and in-flight groups are left fully intact. A row-level "all
+  // filled" check would otherwise wipe a completed group's data + exec just
+  // because a *sibling* group on the same row is incomplete, re-running the
+  // completed one. (`never-run` groups have no exec/output to clear — the
+  // dispatcher runs them via eligibility.)
+  await db.transaction(async (trx) => {
+    for (const group of groups) {
+      const reRunnable = sql`EXISTS (
         SELECT 1 FROM ${tableRowExecutions} re
         WHERE re.row_id = ${userTableRows.id}
-          AND re.group_id = ANY(ARRAY[${sql.join(
-            groupIds.map((gid) => sql`${gid}`),
-            sql`, `
-          )}]::text[])
-          AND re.status IN ('queued', 'running', 'pending')
+          AND re.group_id = ${group.id}
+          AND re.status IN ('error', 'cancelled')
       )`
-    )
-  }
+      const filters: SQL[] = [eq(userTableRows.tableId, tableId), reRunnable]
+      if (rowScope) filters.push(inArray(userTableRows.id, rowScope))
 
-  await db.transaction(async (trx) => {
-    await trx
-      .update(userTableRows)
-      .set({ data: dataExpr, updatedAt: new Date() })
-      .where(and(...filters))
+      let dataExpr: SQL = sql`coalesce(${userTableRows.data}, '{}'::jsonb)`
+      for (const out of group.outputs) dataExpr = sql`(${dataExpr}) - ${out.columnName}::text`
+      await trx
+        .update(userTableRows)
+        .set({ data: dataExpr, updatedAt: new Date() })
+        .where(and(...filters))
 
-    // Step 2: delete the targeted groups' executions for the rows in scope.
-    // Reuse the same row-scope filter via a subquery.
-    const execFilters: SQL[] = [
-      eq(tableRowExecutions.tableId, tableId),
-      inArray(tableRowExecutions.groupId, groupIds),
-    ]
-    if (rowIds && rowIds.length > 0) {
-      execFilters.push(inArray(tableRowExecutions.rowId, rowIds))
-    }
-    if (mode === 'incomplete') {
-      // For `incomplete`, only delete entries that aren't already in-flight
-      // — terminal states (completed/error/cancelled) get wiped so the
-      // dispatcher re-enqueues; in-flight entries stay so we don't race
-      // with their worker.
-      execFilters.push(sql`${tableRowExecutions.status} NOT IN ('queued', 'running', 'pending')`)
+      const execFilters: SQL[] = [
+        eq(tableRowExecutions.tableId, tableId),
+        eq(tableRowExecutions.groupId, group.id),
+        sql`${tableRowExecutions.status} IN ('error', 'cancelled')`,
+      ]
+      if (rowScope) execFilters.push(inArray(tableRowExecutions.rowId, rowScope))
+      await trx.delete(tableRowExecutions).where(and(...execFilters))
     }
-    await trx.delete(tableRowExecutions).where(and(...execFilters))
   })
 }
 
@@ -193,6 +195,44 @@ export async function countRunningCells(
   return { total, byRowId }
 }
 
+/** Authoritative "cells queued or running" count for the table, derived from
+ *  active dispatches so it survives reload and matches the live count. For each
+ *  active dispatch every row in scope ahead of the cursor still has to run each
+ *  targeted group, so remaining work = (rows ahead of cursor) × |groupIds|.
+ *  Exact for Run-all; an upper bound for incomplete/new (rows the eligibility
+ *  filter later skips are still counted). Falls back to the sidecar in-flight
+ *  count when no dispatch is active (orphan stragglers). `byRowId` stays
+ *  sidecar-based — the client overlay renders queued rows ahead of the cursor. */
+export async function countActiveRunCells(
+  tableId: string,
+  dispatches?: DispatchRow[]
+): Promise<{ total: number; byRowId: Record<string, number> }> {
+  const active = dispatches ?? (await listActiveDispatches(tableId))
+  if (active.length === 0) return countRunningCells(tableId)
+
+  const countRowsAhead = async (d: DispatchRow): Promise<number> => {
+    const groupCount = d.scope.groupIds.length
+    if (groupCount === 0) return 0
+    const filters = [eq(userTableRows.tableId, tableId), gt(userTableRows.position, d.cursor)]
+    if (d.scope.rowIds && d.scope.rowIds.length > 0) {
+      filters.push(inArray(userTableRows.id, d.scope.rowIds))
+    }
+    const [row] = await db
+      .select({ rowsAhead: sql<number>`count(*)::int` })
+      .from(userTableRows)
+      .where(and(...filters))
+    return (row?.rowsAhead ?? 0) * groupCount
+  }
+
+  // One round-trip per dispatch + the sidecar count, all in parallel.
+  const [sidecar, perDispatch] = await Promise.all([
+    countRunningCells(tableId),
+    Promise.all(active.map(countRowsAhead)),
+  ])
+  const total = perDispatch.reduce((sum, n) => sum + n, 0)
+  return { total, byRowId: sidecar.byRowId }
+}
+
 export async function listActiveDispatches(tableId: string): Promise<DispatchRow[]> {
   const rows = await db
     .select()
diff --git a/apps/sim/lib/table/workflow-columns.ts b/apps/sim/lib/table/workflow-columns.ts
index b0e7511936a..eda70c99f52 100644
--- a/apps/sim/lib/table/workflow-columns.ts
+++ b/apps/sim/lib/table/workflow-columns.ts
@@ -93,7 +93,14 @@ export function classifyEligibility(
   if (!isManualRun && completedAndFilled) return 'completed-on-auto'
   if (!isManualRun && status === 'error') return 'error-on-auto'
   if (!isManualRun && status === 'cancelled') return 'cancelled-on-auto'
-  if (mode === 'incomplete' && completedAndFilled) return 'completed-on-incomplete'
+  // Manual incomplete-mode runs (Run row / Run incomplete) treat a `completed`
+  // group as done even if an output is blank — only "Run all" re-runs it. The
+  // auto cascade still re-fills blank outputs (completedAndFilled).
+  if (mode === 'incomplete') {
+    if (isManualRun ? status === 'completed' : completedAndFilled) {
+      return 'completed-on-incomplete'
+    }
+  }
 
   if (isManualRun && group.autoRun === false) return 'manual-bypass'
   return areGroupDepsSatisfied(group, row) ? 'eligible' : 'deps-unmet'

From e27afaad0f9d350342a4c9d9913d1d63ac28c73f Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 19:35:33 -0700
Subject: [PATCH 14/16] fix(mcp): probe-based OAuth detection in
 test-connection (#4689)

* fix(mcp): probe-based OAuth detection in test-connection

* fix(mcp): guard undefined url in probe and use canonical McpAuthType
---
 .../api/mcp/servers/test-connection/route.ts  | 17 ++++++++++-
 .../mcp-server-form-modal.tsx                 | 28 ++++++++-----------
 apps/sim/hooks/queries/mcp.ts                 |  9 +++++-
 apps/sim/lib/api/contracts/mcp.ts             |  2 ++
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/apps/sim/app/api/mcp/servers/test-connection/route.ts b/apps/sim/app/api/mcp/servers/test-connection/route.ts
index bd88be77aad..c017de7a34c 100644
--- a/apps/sim/app/api/mcp/servers/test-connection/route.ts
+++ b/apps/sim/app/api/mcp/servers/test-connection/route.ts
@@ -12,8 +12,9 @@ import {
   validateMcpServerSsrf,
 } from '@/lib/mcp/domain-check'
 import { getParsedBody, withMcpAuth } from '@/lib/mcp/middleware'
+import { detectMcpAuthType } from '@/lib/mcp/oauth'
 import { resolveMcpConfigEnvVars } from '@/lib/mcp/resolve-config'
-import type { McpTransport } from '@/lib/mcp/types'
+import type { McpAuthType, McpTransport } from '@/lib/mcp/types'
 import { createMcpErrorResponse, createMcpSuccessResponse } from '@/lib/mcp/utils'
 
 const logger = createLogger('McpServerTestAPI')
@@ -31,6 +32,8 @@ function isUrlBasedTransport(transport: McpTransport): boolean {
 interface TestConnectionResult {
   success: boolean
   error?: string
+  authRequired?: boolean
+  authType?: McpAuthType
   serverInfo?: {
     name: string
     version: string
@@ -163,6 +166,18 @@ export const POST = withRouteHandler(
       }
 
       const result: TestConnectionResult = { success: false }
+
+      // Skip unauth connect when the server returns an RFC 9728 OAuth challenge.
+      if (testConfig.url) {
+        const detectedAuthType = await detectMcpAuthType(testConfig.url)
+        if (detectedAuthType === 'oauth') {
+          result.authRequired = true
+          result.authType = 'oauth'
+          return createMcpSuccessResponse(result, 200)
+        }
+        result.authType = detectedAuthType
+      }
+
       let client: McpClient | null = null
 
       try {
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx
index c4a27748a45..52ad29b3010 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-form-modal/mcp-server-form-modal.tsx
@@ -17,7 +17,7 @@ import {
   Textarea,
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
-import type { McpTransport } from '@/lib/mcp/types'
+import type { McpAuthType, McpTransport } from '@/lib/mcp/types'
 import {
   checkEnvVarTrigger,
   EnvVarDropdown,
@@ -52,6 +52,7 @@ export interface McpServerFormConfig {
   timeout: number
   oauthClientId?: string
   oauthClientSecret?: string
+  authType?: McpAuthType
 }
 
 export interface McpServerFormModalProps {
@@ -109,11 +110,12 @@ interface EnvVarDropdownConfig {
 }
 
 function getTestButtonLabel(
-  testResult: { success: boolean; error?: string } | null,
+  testResult: { success: boolean; error?: string; authRequired?: boolean } | null,
   isTestingConnection: boolean
 ): string {
   if (isTestingConnection) return 'Testing...'
   if (testResult?.success) return 'Connection success'
+  if (testResult?.authRequired) return 'Requires OAuth'
   if (testResult && !testResult.success) return 'No connection: retry'
   return 'Test Connection'
 }
@@ -517,19 +519,11 @@ export function McpServerFormModal({
         workspaceId,
       })
 
-      if (!connectionResult.success) {
-        const errorText = (connectionResult.error || '').toLowerCase()
-        const looksLikeAuthRequired =
-          /\b401\b/.test(errorText) ||
-          errorText.includes('unauthorized') ||
-          errorText.includes('oauth') ||
-          errorText.includes('authentication')
-        if (!looksLikeAuthRequired) {
-          setSubmitError(
-            connectionResult.error || 'Connection test failed. Please check the URL and try again.'
-          )
-          return
-        }
+      if (!connectionResult.success && !connectionResult.authRequired) {
+        setSubmitError(
+          connectionResult.error || 'Connection test failed. Please check the URL and try again.'
+        )
+        return
       }
 
       await onSubmit({
@@ -538,6 +532,7 @@ export function McpServerFormModal({
         url: formData.url!,
         headers,
         timeout: formData.timeout || 30000,
+        authType: connectionResult.authType,
         oauthClientId:
           mode === 'edit'
             ? oauthClientIdChanged
@@ -587,7 +582,7 @@ export function McpServerFormModal({
         workspaceId,
       })
 
-      if (!connectionResult.success) {
+      if (!connectionResult.success && !connectionResult.authRequired) {
         setSubmitError(
           connectionResult.error || 'Connection test failed. Please check the URL and try again.'
         )
@@ -600,6 +595,7 @@ export function McpServerFormModal({
         url: config.url,
         headers: config.headers,
         timeout: 30000,
+        authType: connectionResult.authType,
       })
 
       onOpenChange(false)
diff --git a/apps/sim/hooks/queries/mcp.ts b/apps/sim/hooks/queries/mcp.ts
index 1e583ae5d41..7652df84e75 100644
--- a/apps/sim/hooks/queries/mcp.ts
+++ b/apps/sim/hooks/queries/mcp.ts
@@ -22,7 +22,13 @@ import {
 } from '@/lib/api/contracts/mcp'
 import { isLoopbackHostname } from '@/lib/core/utils/urls'
 import { sanitizeForHttp, sanitizeHeaders } from '@/lib/mcp/shared'
-import type { McpServerStatusConfig, McpTool, McpTransport, StoredMcpTool } from '@/lib/mcp/types'
+import type {
+  McpAuthType,
+  McpServerStatusConfig,
+  McpTool,
+  McpTransport,
+  StoredMcpTool,
+} from '@/lib/mcp/types'
 import { workflowMcpServerKeys } from '@/hooks/queries/workflow-mcp-servers'
 
 const logger = createLogger('McpQueries')
@@ -54,6 +60,7 @@ export interface McpServerInput {
   enabled: boolean
   oauthClientId?: string
   oauthClientSecret?: string
+  authType?: McpAuthType
 }
 
 async function fetchMcpServers(workspaceId: string, signal?: AbortSignal): Promise<McpServer[]> {
diff --git a/apps/sim/lib/api/contracts/mcp.ts b/apps/sim/lib/api/contracts/mcp.ts
index 325201d1dc3..2a6fc9b0888 100644
--- a/apps/sim/lib/api/contracts/mcp.ts
+++ b/apps/sim/lib/api/contracts/mcp.ts
@@ -252,6 +252,8 @@ export const mcpServerTestResultSchema = z.object({
   success: z.boolean(),
   message: z.string().optional(),
   error: z.string().optional(),
+  authRequired: z.boolean().optional(),
+  authType: mcpAuthTypeSchema.optional(),
   serverInfo: z
     .object({
       name: z.string(),

From 11ad8918a9a16f592c576129a8f206d7763cdf7b Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 19:35:40 -0700
Subject: [PATCH 15/16] improvement(cleanup): batchTrigger fan-out, chunked
 queries, batched S3, faster outlier drain (#4688)

* improvement(cleanup): batchTrigger fan-out, chunked queries, batched S3, faster outlier drain

- Fan cleanup-tasks/logs/soft-deletes out via tasks.batchTrigger (500 ws/chunk); bump to large-1x with concurrencyLimit: 5
- Chunk bulk DELETEs (1000 IDs/stmt) and collectChatFiles JSONB SELECT (500 chats/stmt) to bound worker memory and lock duration
- Replace per-key position() table scans with one LATERAL unnest scan per 200-key chunk
- Route storage deletes through StorageService.deleteFiles (S3 DeleteObjects: 1000 keys/HTTP)
- Raise per-run row cap to 100K so long-tail tenants (one prod workspace has 723K doomed rows) drain in days, not weeks

* improvement(cleanup): chunk-index labels, clarify upper-bound failure counter

Addresses Greptile review feedback:
- Disambiguate downstream logs when a plan splits into multiple workspace chunks (e.g. 'free/1', 'free/2')
- Document that deleteRowsById's failed counter is an upper bound (chunk rolls back to 0 deletes on error)
---
 apps/sim/background/cleanup-logs.ts          |  68 +++--
 apps/sim/background/cleanup-soft-deletes.ts  |  47 ++--
 apps/sim/background/cleanup-tasks.ts         |  64 +----
 apps/sim/lib/billing/cleanup-dispatcher.ts   | 250 +++++++++----------
 apps/sim/lib/cleanup/batch-delete.ts         |  44 +++-
 apps/sim/lib/cleanup/chat-cleanup.ts         | 122 ++++-----
 apps/sim/lib/uploads/core/storage-service.ts |  43 ++++
 apps/sim/lib/uploads/providers/s3/client.ts  |  48 ++++
 8 files changed, 370 insertions(+), 316 deletions(-)

diff --git a/apps/sim/background/cleanup-logs.ts b/apps/sim/background/cleanup-logs.ts
index 1f09fa16ecc..090f2e4a729 100644
--- a/apps/sim/background/cleanup-logs.ts
+++ b/apps/sim/background/cleanup-logs.ts
@@ -3,9 +3,10 @@ import { jobExecutionLogs, pausedExecutions, workflowExecutionLogs } from '@sim/
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { and, eq, inArray, isNull, lt, notInArray, or, sql } from 'drizzle-orm'
-import { type CleanupJobPayload, resolveCleanupScope } from '@/lib/billing/cleanup-dispatcher'
+import type { CleanupJobPayload } from '@/lib/billing/cleanup-dispatcher'
 import {
   batchDeleteByWorkspaceAndTimestamp,
+  chunkArray,
   chunkedBatchDelete,
   type TableCleanupResult,
 } from '@/lib/cleanup/batch-delete'
@@ -27,31 +28,34 @@ interface FileDeleteStats {
 
 const RESUMABLE_PAUSED_STATUSES = ['paused', 'partially_resumed', 'cancelling']
 
+/** Caps the per-row predicate cost: keys-per-row is `O(chunk)` not `O(uniqueKeys)`. */
+const REFERENCE_CHECK_KEY_CHUNK_SIZE = 200
+
+/**
+ * One `LATERAL unnest` scan per chunk replaces N per-key sequential scans
+ * (each detoasting the entire JSONB column). Substring semantics identical.
+ */
 async function filterLargeValueKeysWithoutRetainedReferences(
   keys: string[],
   deletedLogIds: string[]
 ): Promise<string[]> {
   if (keys.length === 0 || deletedLogIds.length === 0) return []
 
-  const unreferencedKeys: string[] = []
-  for (const key of Array.from(new Set(keys))) {
-    const [referencingLog] = await db
-      .select({ id: workflowExecutionLogs.id })
-      .from(workflowExecutionLogs)
-      .where(
-        and(
-          notInArray(workflowExecutionLogs.id, deletedLogIds),
-          sql`position(${key} in ${workflowExecutionLogs.executionData}::text) > 0`
-        )
-      )
-      .limit(1)
-
-    if (!referencingLog) {
-      unreferencedKeys.push(key)
-    }
+  const uniqueKeys = Array.from(new Set(keys))
+  const referencedKeys = new Set<string>()
+
+  for (const keyChunk of chunkArray(uniqueKeys, REFERENCE_CHECK_KEY_CHUNK_SIZE)) {
+    const rows = await db.execute<{ key: string }>(sql`
+      SELECT DISTINCT k.key AS key
+      FROM ${workflowExecutionLogs} AS wel,
+           unnest(${keyChunk}::text[]) AS k(key)
+      WHERE wel.id <> ALL(${deletedLogIds}::text[])
+        AND position(k.key in wel.execution_data::text) > 0
+    `)
+    for (const row of rows) referencedKeys.add(row.key)
   }
 
-  return unreferencedKeys
+  return uniqueKeys.filter((key) => !referencedKeys.has(key))
 }
 
 async function deleteExecutionFiles(files: unknown, stats: FileDeleteStats): Promise<void> {
@@ -154,14 +158,7 @@ async function cleanupWorkflowExecutionLogs(
   return { ...dbStats, ...fileStats }
 }
 
-async function cleanupFreePlanOrphanedSnapshots(
-  payload: CleanupJobPayload,
-  retentionHours: number
-): Promise<void> {
-  if (payload.plan !== 'free') {
-    return
-  }
-
+async function cleanupFreePlanOrphanedSnapshots(retentionHours: number): Promise<void> {
   try {
     const retentionDays = Math.floor(retentionHours / 24)
     const snapshotsCleaned = await snapshotService.cleanupOrphanedSnapshots(retentionDays + 1)
@@ -173,20 +170,15 @@ async function cleanupFreePlanOrphanedSnapshots(
 
 export async function runCleanupLogs(payload: CleanupJobPayload): Promise<void> {
   const startTime = Date.now()
-
-  const scope = await resolveCleanupScope('cleanup-logs', payload)
-  if (!scope) {
-    logger.info(`[${payload.plan}] No retention configured, skipping`)
-    return
-  }
-
-  const { workspaceIds, retentionHours, label } = scope
+  const { workspaceIds, retentionHours, label, plan, runGlobalHousekeeping } = payload
 
   const retentionDate = new Date(Date.now() - retentionHours * 60 * 60 * 1000)
 
   if (workspaceIds.length === 0) {
     logger.info(`[${label}] No workspaces to process`)
-    await cleanupFreePlanOrphanedSnapshots(payload, retentionHours)
+    if (runGlobalHousekeeping && plan === 'free') {
+      await cleanupFreePlanOrphanedSnapshots(retentionHours)
+    }
     return
   }
 
@@ -211,7 +203,9 @@ export async function runCleanupLogs(payload: CleanupJobPayload): Promise<void>
     tableName: `${label}/job_execution_logs`,
   })
 
-  await cleanupFreePlanOrphanedSnapshots(payload, retentionHours)
+  if (runGlobalHousekeeping && plan === 'free') {
+    await cleanupFreePlanOrphanedSnapshots(retentionHours)
+  }
 
   const timeElapsed = (Date.now() - startTime) / 1000
   logger.info(`[${label}] Job completed in ${timeElapsed.toFixed(2)}s`)
@@ -219,5 +213,7 @@ export async function runCleanupLogs(payload: CleanupJobPayload): Promise<void>
 
 export const cleanupLogsTask = task({
   id: 'cleanup-logs',
+  machine: 'large-1x',
+  queue: { concurrencyLimit: 5 },
   run: runCleanupLogs,
 })
diff --git a/apps/sim/background/cleanup-soft-deletes.ts b/apps/sim/background/cleanup-soft-deletes.ts
index 51733074075..9b960ff42f2 100644
--- a/apps/sim/background/cleanup-soft-deletes.ts
+++ b/apps/sim/background/cleanup-soft-deletes.ts
@@ -15,7 +15,7 @@ import {
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { and, inArray, isNotNull, lt } from 'drizzle-orm'
-import { type CleanupJobPayload, resolveCleanupScope } from '@/lib/billing/cleanup-dispatcher'
+import type { CleanupJobPayload } from '@/lib/billing/cleanup-dispatcher'
 import {
   batchDeleteByWorkspaceAndTimestamp,
   deleteRowsById,
@@ -92,22 +92,26 @@ async function cleanupWorkspaceFileStorage(
   const stats = { filesDeleted: 0, filesFailed: 0 }
   if (!isUsingCloudStorage()) return stats
 
-  const toDelete: Array<{ key: string; context: StorageContext }> = [
-    ...scope.legacyRows.map((r) => ({ key: r.key, context: 'workspace' as StorageContext })),
-    ...scope.multiContextRows.map((r) => ({ key: r.key, context: r.context })),
-  ]
+  const keysByContext = new Map<StorageContext, string[]>()
+  for (const r of scope.legacyRows) {
+    const bucket = keysByContext.get('workspace')
+    if (bucket) bucket.push(r.key)
+    else keysByContext.set('workspace', [r.key])
+  }
+  for (const r of scope.multiContextRows) {
+    const bucket = keysByContext.get(r.context)
+    if (bucket) bucket.push(r.key)
+    else keysByContext.set(r.context, [r.key])
+  }
 
-  await Promise.all(
-    toDelete.map(async ({ key, context }) => {
-      try {
-        await StorageService.deleteFile({ key, context })
-        stats.filesDeleted++
-      } catch (error) {
-        stats.filesFailed++
-        logger.error(`Failed to delete storage file ${key} (context: ${context}):`, { error })
-      }
-    })
-  )
+  for (const [context, keys] of keysByContext) {
+    const result = await StorageService.deleteFiles(keys, context)
+    stats.filesDeleted += result.deleted
+    stats.filesFailed += result.failed.length
+    for (const { key, error } of result.failed) {
+      logger.error(`Failed to delete storage file ${key} (context: ${context}):`, { error })
+    }
+  }
 
   return stats
 }
@@ -160,14 +164,7 @@ const CLEANUP_TARGETS = [
 
 export async function runCleanupSoftDeletes(payload: CleanupJobPayload): Promise<void> {
   const startTime = Date.now()
-
-  const scope = await resolveCleanupScope('cleanup-soft-deletes', payload)
-  if (!scope) {
-    logger.info(`[${payload.plan}] No retention configured, skipping`)
-    return
-  }
-
-  const { workspaceIds, retentionHours, label } = scope
+  const { workspaceIds, retentionHours, label } = payload
 
   if (workspaceIds.length === 0) {
     logger.info(`[${label}] No workspaces to process`)
@@ -274,5 +271,7 @@ export async function runCleanupSoftDeletes(payload: CleanupJobPayload): Promise
 
 export const cleanupSoftDeletesTask = task({
   id: 'cleanup-soft-deletes',
+  machine: 'large-1x',
+  queue: { concurrencyLimit: 5 },
   run: runCleanupSoftDeletes,
 })
diff --git a/apps/sim/background/cleanup-tasks.ts b/apps/sim/background/cleanup-tasks.ts
index 25ef67461ed..341f5132eaa 100644
--- a/apps/sim/background/cleanup-tasks.ts
+++ b/apps/sim/background/cleanup-tasks.ts
@@ -9,8 +9,8 @@ import {
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
-import { and, inArray, lt, sql } from 'drizzle-orm'
-import { type CleanupJobPayload, resolveCleanupScope } from '@/lib/billing/cleanup-dispatcher'
+import { and, inArray, lt } from 'drizzle-orm'
+import type { CleanupJobPayload } from '@/lib/billing/cleanup-dispatcher'
 import {
   batchDeleteByWorkspaceAndTimestamp,
   deleteRowsById,
@@ -38,27 +38,6 @@ const RUN_CHILD_TABLES = [
   },
 ] as const
 
-async function deleteByRunIds(
-  table: (typeof RUN_CHILD_TABLES)[number]['table'],
-  runIdCol: (typeof RUN_CHILD_TABLES)[number]['runIdCol'],
-  runIds: string[],
-  tableName: string
-): Promise<TableCleanupResult> {
-  const result: TableCleanupResult = { table: tableName, deleted: 0, failed: 0 }
-  try {
-    const deleted = await db
-      .delete(table)
-      .where(inArray(runIdCol, runIds))
-      .returning({ id: sql`id` })
-    result.deleted = deleted.length
-    logger.info(`[${tableName}] Deleted ${deleted.length} rows`)
-  } catch (error) {
-    result.failed++
-    logger.error(`[${tableName}] Delete failed:`, { error })
-  }
-  return result
-}
-
 async function cleanupRunChildren(
   workspaceIds: string[],
   retentionDate: Date,
@@ -83,20 +62,13 @@ async function cleanupRunChildren(
   const ids = runIds.map((r) => r.id)
 
   return Promise.all(
-    RUN_CHILD_TABLES.map((t) => deleteByRunIds(t.table, t.runIdCol, ids, `${label}/${t.name}`))
+    RUN_CHILD_TABLES.map((t) => deleteRowsById(t.table, t.runIdCol, ids, `${label}/${t.name}`))
   )
 }
 
 export async function runCleanupTasks(payload: CleanupJobPayload): Promise<void> {
   const startTime = Date.now()
-
-  const scope = await resolveCleanupScope('cleanup-tasks', payload)
-  if (!scope) {
-    logger.info(`[${payload.plan}] No retention configured, skipping`)
-    return
-  }
-
-  const { workspaceIds, retentionHours, label } = scope
+  const { workspaceIds, retentionHours, label } = payload
 
   if (workspaceIds.length === 0) {
     logger.info(`[${label}] No workspaces to process`)
@@ -130,26 +102,12 @@ export async function runCleanupTasks(payload: CleanupJobPayload): Promise<void>
   }
 
   // Delete feedback — no direct workspaceId, reuse chat IDs collected above
-  const feedbackResult: TableCleanupResult = {
-    table: `${label}/copilotFeedback`,
-    deleted: 0,
-    failed: 0,
-  }
-  try {
-    if (doomedChatIds.length > 0) {
-      const deleted = await db
-        .delete(copilotFeedback)
-        .where(inArray(copilotFeedback.chatId, doomedChatIds))
-        .returning({ id: copilotFeedback.feedbackId })
-      feedbackResult.deleted = deleted.length
-      logger.info(`[${feedbackResult.table}] Deleted ${deleted.length} rows`)
-    } else {
-      logger.info(`[${feedbackResult.table}] No expired rows found`)
-    }
-  } catch (error) {
-    feedbackResult.failed++
-    logger.error(`[${feedbackResult.table}] Delete failed:`, { error })
-  }
+  const feedbackResult = await deleteRowsById(
+    copilotFeedback,
+    copilotFeedback.chatId,
+    doomedChatIds,
+    `${label}/copilotFeedback`
+  )
 
   // Delete copilot runs (has workspaceId directly, cascades checkpoints)
   const runsResult = await batchDeleteByWorkspaceAndTimestamp({
@@ -198,5 +156,7 @@ export async function runCleanupTasks(payload: CleanupJobPayload): Promise<void>
 
 export const cleanupTasksTask = task({
   id: 'cleanup-tasks',
+  machine: 'large-1x',
+  queue: { concurrencyLimit: 5 },
   run: runCleanupTasks,
 })
diff --git a/apps/sim/lib/billing/cleanup-dispatcher.ts b/apps/sim/lib/billing/cleanup-dispatcher.ts
index 3c1c5cd81d8..23c410ee365 100644
--- a/apps/sim/lib/billing/cleanup-dispatcher.ts
+++ b/apps/sim/lib/billing/cleanup-dispatcher.ts
@@ -7,6 +7,7 @@ import { eq, isNull } from 'drizzle-orm'
 import { getOrganizationSubscription } from '@/lib/billing/core/billing'
 import { getHighestPriorityPersonalSubscription } from '@/lib/billing/core/subscription'
 import { getPlanType, type PlanCategory } from '@/lib/billing/plan-helpers'
+import { chunkArray } from '@/lib/cleanup/batch-delete'
 import { getJobQueue } from '@/lib/core/async-jobs'
 import { shouldExecuteInline } from '@/lib/core/async-jobs/config'
 import type { EnqueueOptions } from '@/lib/core/async-jobs/types'
@@ -15,8 +16,12 @@ import { isOrganizationWorkspace, WORKSPACE_MODE } from '@/lib/workspaces/policy
 
 const logger = createLogger('RetentionDispatcher')
 
+/** Trigger.dev's documented cap on items per `batchTrigger` call (SDK 4.3.1+). */
 const BATCH_TRIGGER_CHUNK_SIZE = 1000
 
+/** Bounds per-run memory + DB connections regardless of plan size. */
+const WORKSPACES_PER_CLEANUP_CHUNK = 500
+
 export type CleanupJobType = 'cleanup-logs' | 'cleanup-soft-deletes' | 'cleanup-tasks'
 
 export type OrganizationRetentionKey =
@@ -32,9 +37,14 @@ export type NonEnterprisePlan = Exclude<PlanCategory, 'enterprise'>
 
 const NON_ENTERPRISE_PLANS = ['free', 'pro', 'team'] as const satisfies readonly NonEnterprisePlan[]
 
-export type CleanupJobPayload =
-  | { plan: NonEnterprisePlan }
-  | { plan: 'enterprise'; workspaceId: string }
+export interface CleanupJobPayload {
+  plan: PlanCategory
+  workspaceIds: string[]
+  retentionHours: number
+  label: string
+  /** Set on exactly one chunk per dispatch so plan-wide housekeeping runs once. */
+  runGlobalHousekeeping?: boolean
+}
 
 interface CleanupJobConfig {
   key: OrganizationRetentionKey
@@ -170,74 +180,6 @@ async function resolvePlanTypesByWorkspaceId(
   return new Map(entries.filter((entry): entry is PlanResolutionEntry => entry !== null))
 }
 
-/**
- * Bulk-lookup workspace IDs for a non-enterprise plan category using the same
- * effective-plan lookup used by execution, limits, and workspace policy.
- * Enterprise is per-workspace (routed through the owning organization's
- * retention config).
- */
-async function resolveWorkspaceIdsForPlan(plan: NonEnterprisePlan): Promise<string[]> {
-  const rows = await listActiveWorkspaceCleanupScopeRows()
-  const planByWorkspaceId = await resolvePlanTypesByWorkspaceId(rows)
-  return rows.filter((row) => planByWorkspaceId.get(row.id) === plan).map((row) => row.id)
-}
-
-export interface ResolvedCleanupScope {
-  workspaceIds: string[]
-  retentionHours: number
-  label: string
-}
-
-/**
- * Translate a queued cleanup payload into a concrete cleanup scope: the set of
- * workspaces and the retention cutoff to apply. Returns `null` when the plan
- * has no retention configured (default is null, or the enterprise org has not
- * set this key).
- */
-export async function resolveCleanupScope(
-  jobType: CleanupJobType,
-  payload: CleanupJobPayload
-): Promise<ResolvedCleanupScope | null> {
-  const config = CLEANUP_CONFIG[jobType]
-
-  if (payload.plan !== 'enterprise') {
-    const retentionHours = config.defaults[payload.plan]
-    if (retentionHours === null) return null
-    const workspaceIds = await resolveWorkspaceIdsForPlan(payload.plan)
-    return { workspaceIds, retentionHours, label: payload.plan }
-  }
-
-  const [row] = await db
-    .select({
-      id: workspace.id,
-      organizationId: workspace.organizationId,
-      workspaceMode: workspace.workspaceMode,
-      billedAccountUserId: workspace.billedAccountUserId,
-      settings: organization.dataRetentionSettings,
-    })
-    .from(workspace)
-    .innerJoin(organization, eq(organization.id, workspace.organizationId))
-    .where(eq(workspace.id, payload.workspaceId))
-    .limit(1)
-
-  if (!row || !isOrganizationWorkspace(row)) return null
-
-  const organizationId = row.organizationId
-  if (!organizationId) return null
-
-  const subscription = await getOrganizationSubscription(organizationId, { onError: 'throw' })
-  if (getPlanType(subscription?.plan) !== 'enterprise') return null
-
-  const hours = row?.settings?.[config.key]
-  if (hours == null) return null
-
-  return {
-    workspaceIds: [payload.workspaceId],
-    retentionHours: hours,
-    label: `enterprise/${payload.workspaceId}`,
-  }
-}
-
 async function buildCleanupRunner(jobType: CleanupJobType): Promise<EnqueueOptions['runner']> {
   const cleanupRunner = await (async () => {
     switch (jobType) {
@@ -252,91 +194,131 @@ async function buildCleanupRunner(jobType: CleanupJobType): Promise<EnqueueOptio
   return ((payload) => cleanupRunner(payload as CleanupJobPayload)) as EnqueueOptions['runner']
 }
 
-/**
- * Dispatcher: enqueue cleanup jobs driven by `CLEANUP_CONFIG`.
- *
- * - One job per non-enterprise plan with a non-null default
- * - One enterprise job per workspace whose owning organization has a non-null
- *   retention value for this job's key
- *
- * Uses Trigger.dev batchTrigger when available, otherwise parallel enqueue via
- * the JobQueueBackend abstraction. On the database backend (no external worker),
- * jobs run inline in the same process via fire-and-forget promises.
- */
-export async function dispatchCleanupJobs(
-  jobType: CleanupJobType
-): Promise<{ jobIds: string[]; jobCount: number; enterpriseCount: number }> {
-  const config = CLEANUP_CONFIG[jobType]
-  const jobQueue = await getJobQueue()
-  const jobIds: string[] = []
+/** Job type → plan whose housekeeping is global, not per-workspace. */
+const GLOBAL_HOUSEKEEPING_PLAN: Partial<Record<CleanupJobType, PlanCategory>> = {
+  'cleanup-logs': 'free',
+}
 
-  const plansWithDefaults = NON_ENTERPRISE_PLANS.filter((plan) => config.defaults[plan] !== null)
+async function buildCleanupChunks(jobType: CleanupJobType): Promise<CleanupJobPayload[]> {
+  const config = CLEANUP_CONFIG[jobType]
+  const activeRows = await listActiveWorkspaceCleanupScopeRows()
+  const planByWorkspaceId = await resolvePlanTypesByWorkspaceId(activeRows)
+
+  const chunks: CleanupJobPayload[] = []
+
+  for (const plan of NON_ENTERPRISE_PLANS) {
+    const retentionHours = config.defaults[plan]
+    if (retentionHours === null) continue
+    const workspaceIds = activeRows
+      .filter((row) => planByWorkspaceId.get(row.id) === plan)
+      .map((row) => row.id)
+    if (workspaceIds.length === 0) continue
+    const planChunks = chunkArray(workspaceIds, WORKSPACES_PER_CLEANUP_CHUNK)
+    for (const [idx, ws] of planChunks.entries()) {
+      chunks.push({
+        plan,
+        workspaceIds: ws,
+        retentionHours,
+        label: planChunks.length > 1 ? `${plan}/${idx + 1}` : plan,
+      })
+    }
+  }
 
-  for (const plan of plansWithDefaults) {
-    const payload: CleanupJobPayload = { plan }
-    const jobId = await jobQueue.enqueue(jobType, payload, {
-      runner: shouldExecuteInline() ? await buildCleanupRunner(jobType) : undefined,
+  for (const row of activeRows) {
+    if (planByWorkspaceId.get(row.id) !== 'enterprise') continue
+    const hours = row.organizationSettings?.[config.key]
+    if (hours == null) continue
+    chunks.push({
+      plan: 'enterprise',
+      workspaceIds: [row.id],
+      retentionHours: hours,
+      label: `enterprise/${row.id}`,
     })
-    jobIds.push(jobId)
   }
 
-  const activeWorkspaceRows = await listActiveWorkspaceCleanupScopeRows()
-  const planByWorkspaceId = await resolvePlanTypesByWorkspaceId(activeWorkspaceRows)
-  const enterpriseRows = activeWorkspaceRows.filter(
-    (row) =>
-      planByWorkspaceId.get(row.id) === 'enterprise' &&
-      row.organizationSettings?.[config.key] != null
-  )
+  const housekeepingPlan = GLOBAL_HOUSEKEEPING_PLAN[jobType]
+  if (housekeepingPlan) {
+    const target = chunks.find((c) => c.plan === housekeepingPlan)
+    if (target) {
+      target.runGlobalHousekeeping = true
+    } else if (housekeepingPlan !== 'enterprise') {
+      // Synthetic empty chunk so housekeeping still fires when the plan has no workspaces.
+      const retentionHours = config.defaults[housekeepingPlan]
+      if (retentionHours != null) {
+        chunks.push({
+          plan: housekeepingPlan,
+          workspaceIds: [],
+          retentionHours,
+          label: `${housekeepingPlan}/housekeeping`,
+          runGlobalHousekeeping: true,
+        })
+      }
+    }
+  }
+
+  return chunks
+}
 
-  const enterpriseCount = enterpriseRows.length
+/**
+ * Resolve the workspace set + retention cutoff once, then fan out one task
+ * run per `WORKSPACES_PER_CLEANUP_CHUNK` workspaces via `tasks.batchTrigger`.
+ * Falls back to `JobQueueBackend` enqueue when Trigger.dev isn't available.
+ */
+export async function dispatchCleanupJobs(jobType: CleanupJobType): Promise<{
+  jobIds: string[]
+  jobCount: number
+  chunkCount: number
+  workspaceCount: number
+}> {
+  const chunks = await buildCleanupChunks(jobType)
+  const workspaceCount = chunks.reduce((sum, c) => sum + c.workspaceIds.length, 0)
 
-  const planLabels = plansWithDefaults.join('+') || 'none'
   logger.info(
-    `[${jobType}] Dispatching: plans=[${planLabels}] + ${enterpriseCount} enterprise jobs (key: ${config.key})`
+    `[${jobType}] Dispatching: ${chunks.length} chunk(s) covering ${workspaceCount} workspace(s)`
   )
 
-  if (enterpriseCount === 0) {
-    return { jobIds, jobCount: jobIds.length, enterpriseCount: 0 }
+  if (chunks.length === 0) {
+    return { jobIds: [], jobCount: 0, chunkCount: 0, workspaceCount: 0 }
   }
 
+  const jobIds: string[] = []
+
   if (isTriggerAvailable()) {
-    // Trigger.dev: use batchTrigger, chunked
-    for (let i = 0; i < enterpriseRows.length; i += BATCH_TRIGGER_CHUNK_SIZE) {
-      const chunk = enterpriseRows.slice(i, i + BATCH_TRIGGER_CHUNK_SIZE)
+    for (let i = 0; i < chunks.length; i += BATCH_TRIGGER_CHUNK_SIZE) {
+      const batch = chunks.slice(i, i + BATCH_TRIGGER_CHUNK_SIZE)
       const batchResult = await tasks.batchTrigger(
         jobType,
-        chunk.map((row) => ({
-          payload: { plan: 'enterprise' as const, workspaceId: row.id },
+        batch.map((payload) => ({
+          payload,
           options: {
-            tags: [`workspaceId:${row.id}`, `jobType:${jobType}`],
+            tags: [`plan:${payload.plan}`, `jobType:${jobType}`],
           },
         }))
       )
       jobIds.push(batchResult.batchId)
     }
-  } else {
-    // Fallback: parallel enqueue via abstraction
-    const inlineRunner = shouldExecuteInline() ? await buildCleanupRunner(jobType) : undefined
-    const results = await Promise.allSettled(
-      enterpriseRows.map(async (row) => {
-        const payload: CleanupJobPayload = { plan: 'enterprise', workspaceId: row.id }
-        return jobQueue.enqueue(jobType, payload, { runner: inlineRunner })
-      })
-    )
-
-    let succeeded = 0
-    let failed = 0
-    for (const result of results) {
-      if (result.status === 'fulfilled') {
-        jobIds.push(result.value)
-        succeeded++
-      } else {
-        failed++
-        logger.error(`[${jobType}] Failed to enqueue enterprise job:`, { reason: result.reason })
-      }
+    return { jobIds, jobCount: jobIds.length, chunkCount: chunks.length, workspaceCount }
+  }
+
+  // Fallback: parallel enqueue via abstraction (self-hosted / inline path)
+  const inlineRunner = shouldExecuteInline() ? await buildCleanupRunner(jobType) : undefined
+  const jobQueue = await getJobQueue()
+  const results = await Promise.allSettled(
+    chunks.map((payload) => jobQueue.enqueue(jobType, payload, { runner: inlineRunner }))
+  )
+
+  let succeeded = 0
+  let failed = 0
+  for (const result of results) {
+    if (result.status === 'fulfilled') {
+      jobIds.push(result.value)
+      succeeded++
+    } else {
+      failed++
+      logger.error(`[${jobType}] Failed to enqueue chunk:`, { reason: result.reason })
     }
-    logger.info(`[${jobType}] Enterprise enqueue: ${succeeded} succeeded, ${failed} failed`)
   }
+  logger.info(`[${jobType}] Chunk enqueue: ${succeeded} succeeded, ${failed} failed`)
 
-  return { jobIds, jobCount: jobIds.length, enterpriseCount }
+  return { jobIds, jobCount: jobIds.length, chunkCount: chunks.length, workspaceCount }
 }
diff --git a/apps/sim/lib/cleanup/batch-delete.ts b/apps/sim/lib/cleanup/batch-delete.ts
index dbf6cf21c51..3241bea9df9 100644
--- a/apps/sim/lib/cleanup/batch-delete.ts
+++ b/apps/sim/lib/cleanup/batch-delete.ts
@@ -6,7 +6,8 @@ import type { PgColumn, PgTable } from 'drizzle-orm/pg-core'
 const logger = createLogger('BatchDelete')
 
 export const DEFAULT_BATCH_SIZE = 2000
-export const DEFAULT_MAX_BATCHES_PER_TABLE = 10
+/** 50 × 2000 = 100K row cap per cleanup run; drains long-tail tenants in days, not weeks. */
+export const DEFAULT_MAX_BATCHES_PER_TABLE = 50
 /**
  * Split workspaceIds into this-sized groups before running SELECT/DELETE. Large
  * IN lists combined with `started_at < X` force Postgres to probe every
@@ -14,6 +15,8 @@ export const DEFAULT_MAX_BATCHES_PER_TABLE = 10
  * at the scale of the full free tier.
  */
 export const DEFAULT_WORKSPACE_CHUNK_SIZE = 50
+/** Bounds FK cascade trigger queue (per-statement in-memory) and bind-parameter count. */
+export const DEFAULT_DELETE_CHUNK_SIZE = 1000
 
 export function chunkArray<T>(arr: T[], size: number): T[][] {
   const out: T[][] = []
@@ -215,26 +218,41 @@ export async function batchDeleteByWorkspaceAndTimestamp({
 }
 
 /**
- * Delete rows by an explicit list of IDs. Use this when the IDs were selected
- * upstream (e.g., to drive external cleanup like S3 deletes or a backend API
- * call) so the DB delete cannot drift from the upstream selection. Paired with
- * `batchDeleteByWorkspaceAndTimestamp` for tables with no external side effects.
+ * Delete by explicit ID list, chunked so each statement is its own transaction.
+ * Partial progress survives chunk-level failures.
  */
 export async function deleteRowsById(
   tableDef: PgTable,
   idCol: PgColumn,
   ids: string[],
-  tableName: string
+  tableName: string,
+  chunkSize: number = DEFAULT_DELETE_CHUNK_SIZE
 ): Promise<TableCleanupResult> {
   const result: TableCleanupResult = { table: tableName, deleted: 0, failed: 0 }
   if (ids.length === 0) return result
-  try {
-    const deleted = await db.delete(tableDef).where(inArray(idCol, ids)).returning({ id: idCol })
-    result.deleted = deleted.length
-    logger.info(`[${tableName}] Deleted ${deleted.length} rows`)
-  } catch (error) {
-    result.failed++
-    logger.error(`[${tableName}] Delete failed:`, { error })
+
+  const chunks = chunkArray(ids, chunkSize)
+  for (const [chunkIdx, chunkIds] of chunks.entries()) {
+    try {
+      const deleted = await db
+        .delete(tableDef)
+        .where(inArray(idCol, chunkIds))
+        .returning({ id: idCol })
+      result.deleted += deleted.length
+    } catch (error) {
+      // Upper bound: Postgres rolls back the chunk on error, so actual deletes = 0,
+      // but we can't tell which IDs in the chunk would have matched. The next cron
+      // run picks up whatever's still expired, so this only inflates the metric.
+      result.failed += chunkIds.length
+      logger.error(
+        `[${tableName}] Delete chunk ${chunkIdx + 1}/${chunks.length} failed (up to ${chunkIds.length} rows):`,
+        { error }
+      )
+    }
   }
+
+  logger.info(
+    `[${tableName}] Deleted ${result.deleted} rows across ${chunks.length} chunk(s)${result.failed > 0 ? `, ${result.failed} failed` : ''}`
+  )
   return result
 }
diff --git a/apps/sim/lib/cleanup/chat-cleanup.ts b/apps/sim/lib/cleanup/chat-cleanup.ts
index 5999706e2a0..b154687bc37 100644
--- a/apps/sim/lib/cleanup/chat-cleanup.ts
+++ b/apps/sim/lib/cleanup/chat-cleanup.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import { copilotChats, workspaceFiles } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, inArray, isNull } from 'drizzle-orm'
+import { chunkArray } from '@/lib/cleanup/batch-delete'
 import { SIM_AGENT_API_URL } from '@/lib/copilot/constants'
 import { env } from '@/lib/core/config/env'
 import type { StorageContext } from '@/lib/uploads'
@@ -10,6 +11,8 @@ import { isUsingCloudStorage, StorageService } from '@/lib/uploads'
 const logger = createLogger('ChatCleanup')
 
 const COPILOT_CLEANUP_BATCH_SIZE = 1000
+/** Bounds JSONB detoast memory: `messages` can be MBs per row. */
+const CHAT_FILE_COLLECT_CHUNK_SIZE = 500
 
 /**
  * Only storage in these contexts is tied to chat/task lifecycle. Workspace
@@ -26,10 +29,9 @@ interface FileRef {
 }
 
 /**
- * Collect all file storage keys associated with the given chat IDs.
- * Two sources:
- * 1. workspaceFiles rows with chatId FK — filtered to chat-scoped contexts only
- * 2. fileAttachments[].key inside copilotChats.messages JSONB — all copilot uploads
+ * Collect all file storage keys for the given chat IDs from two sources:
+ * 1. workspaceFiles rows with chatId FK (chat-scoped contexts only)
+ * 2. fileAttachments[].key inside copilotChats.messages JSONB
  */
 export async function collectChatFiles(chatIds: string[]): Promise<FileRef[]> {
   const files: FileRef[] = []
@@ -37,47 +39,49 @@ export async function collectChatFiles(chatIds: string[]): Promise<FileRef[]> {
 
   const seen = new Set<string>()
 
-  const [linkedFiles, chatsWithMessages] = await Promise.all([
-    db
-      .select({ key: workspaceFiles.key, context: workspaceFiles.context })
-      .from(workspaceFiles)
-      .where(
-        and(
-          inArray(workspaceFiles.chatId, chatIds),
-          isNull(workspaceFiles.deletedAt),
-          inArray(workspaceFiles.context, [...CHAT_SCOPED_CONTEXTS])
-        )
-      ),
-    db
-      .select({ messages: copilotChats.messages })
-      .from(copilotChats)
-      .where(inArray(copilotChats.id, chatIds)),
-  ])
-
-  for (const f of linkedFiles) {
-    if (!seen.has(f.key)) {
-      seen.add(f.key)
-      files.push({ key: f.key, context: f.context as ChatScopedContext })
+  for (const chunk of chunkArray(chatIds, CHAT_FILE_COLLECT_CHUNK_SIZE)) {
+    const [linkedFiles, chatsWithMessages] = await Promise.all([
+      db
+        .select({ key: workspaceFiles.key, context: workspaceFiles.context })
+        .from(workspaceFiles)
+        .where(
+          and(
+            inArray(workspaceFiles.chatId, chunk),
+            isNull(workspaceFiles.deletedAt),
+            inArray(workspaceFiles.context, [...CHAT_SCOPED_CONTEXTS])
+          )
+        ),
+      db
+        .select({ messages: copilotChats.messages })
+        .from(copilotChats)
+        .where(inArray(copilotChats.id, chunk)),
+    ])
+
+    for (const f of linkedFiles) {
+      if (!seen.has(f.key)) {
+        seen.add(f.key)
+        files.push({ key: f.key, context: f.context as ChatScopedContext })
+      }
     }
-  }
 
-  for (const chat of chatsWithMessages) {
-    const messages = chat.messages as unknown[]
-    if (!Array.isArray(messages)) continue
-    for (const msg of messages) {
-      if (!msg || typeof msg !== 'object') continue
-      const attachments = (msg as Record<string, unknown>).fileAttachments
-      if (!Array.isArray(attachments)) continue
-      for (const attachment of attachments) {
-        if (
-          attachment &&
-          typeof attachment === 'object' &&
-          (attachment as Record<string, unknown>).key
-        ) {
-          const key = (attachment as Record<string, unknown>).key as string
-          if (!seen.has(key)) {
-            seen.add(key)
-            files.push({ key, context: 'copilot' })
+    for (const chat of chatsWithMessages) {
+      const messages = chat.messages as unknown[]
+      if (!Array.isArray(messages)) continue
+      for (const msg of messages) {
+        if (!msg || typeof msg !== 'object') continue
+        const attachments = (msg as Record<string, unknown>).fileAttachments
+        if (!Array.isArray(attachments)) continue
+        for (const attachment of attachments) {
+          if (
+            attachment &&
+            typeof attachment === 'object' &&
+            (attachment as Record<string, unknown>).key
+          ) {
+            const key = (attachment as Record<string, unknown>).key as string
+            if (!seen.has(key)) {
+              seen.add(key)
+              files.push({ key, context: 'copilot' })
+            }
           }
         }
       }
@@ -87,9 +91,7 @@ export async function collectChatFiles(chatIds: string[]): Promise<FileRef[]> {
   return files
 }
 
-/**
- * Delete files from cloud storage using the correct context/bucket per file.
- */
+/** Groups files by storage context so each context can use one batch DELETE call. */
 export async function deleteStorageFiles(
   files: FileRef[],
   label: string
@@ -97,17 +99,23 @@ export async function deleteStorageFiles(
   const stats = { filesDeleted: 0, filesFailed: 0 }
   if (files.length === 0 || !isUsingCloudStorage()) return stats
 
-  await Promise.all(
-    files.map(async (file) => {
-      try {
-        await StorageService.deleteFile({ key: file.key, context: file.context })
-        stats.filesDeleted++
-      } catch (error) {
-        stats.filesFailed++
-        logger.error(`[${label}] Failed to delete storage file ${file.key}:`, { error })
-      }
-    })
-  )
+  const keysByContext = new Map<ChatScopedContext, string[]>()
+  for (const file of files) {
+    const bucket = keysByContext.get(file.context)
+    if (bucket) bucket.push(file.key)
+    else keysByContext.set(file.context, [file.key])
+  }
+
+  for (const [context, keys] of keysByContext) {
+    const result = await StorageService.deleteFiles(keys, context)
+    stats.filesDeleted += result.deleted
+    stats.filesFailed += result.failed.length
+    for (const { key, error } of result.failed) {
+      logger.error(`[${label}] Failed to delete storage file ${key} (context: ${context}):`, {
+        error,
+      })
+    }
+  }
 
   return stats
 }
diff --git a/apps/sim/lib/uploads/core/storage-service.ts b/apps/sim/lib/uploads/core/storage-service.ts
index 75632f2cba7..7a5ba092f29 100644
--- a/apps/sim/lib/uploads/core/storage-service.ts
+++ b/apps/sim/lib/uploads/core/storage-service.ts
@@ -1,5 +1,6 @@
 import { randomBytes } from 'crypto'
 import { createLogger } from '@sim/logger'
+import { getErrorMessage } from '@sim/utils/errors'
 import { getStorageConfig, USE_BLOB_STORAGE, USE_S3_STORAGE } from '@/lib/uploads/config'
 import type { BlobConfig } from '@/lib/uploads/providers/blob/types'
 import type { S3Config } from '@/lib/uploads/providers/s3/types'
@@ -239,6 +240,48 @@ export async function deleteFile(options: DeleteFileOptions): Promise<void> {
   await unlink(filePath)
 }
 
+/** AWS SDK v3 silently caps HTTP connections at 50/endpoint — stay well under. */
+const PER_FILE_DELETE_CONCURRENCY = 25
+
+/**
+ * Bulk delete via the provider's native multi-object API when available
+ * (S3 `DeleteObjects`), else bounded-concurrency per-file. All keys must
+ * share `context`. Idempotent on missing keys.
+ */
+export async function deleteFiles(
+  keys: string[],
+  context: StorageContext
+): Promise<{ deleted: number; failed: Array<{ key: string; error: string }> }> {
+  if (keys.length === 0) return { deleted: 0, failed: [] }
+
+  const config = getStorageConfig(context)
+
+  if (USE_S3_STORAGE) {
+    const { deleteManyFromS3 } = await import('@/lib/uploads/providers/s3/client')
+    const { failed } = await deleteManyFromS3(keys, createS3Config(config))
+    return { deleted: keys.length - failed.length, failed }
+  }
+
+  const failed: Array<{ key: string; error: string }> = []
+  let cursor = 0
+  const runWorker = async (): Promise<void> => {
+    while (cursor < keys.length) {
+      const idx = cursor++
+      const key = keys[idx]
+      try {
+        await deleteFile({ key, context })
+      } catch (error) {
+        failed.push({ key, error: getErrorMessage(error) })
+      }
+    }
+  }
+
+  const workerCount = Math.min(PER_FILE_DELETE_CONCURRENCY, keys.length)
+  await Promise.all(Array.from({ length: workerCount }, runWorker))
+
+  return { deleted: keys.length - failed.length, failed }
+}
+
 /**
  * Check whether an object exists in the configured cloud storage provider.
  * Returns object size and content-type when present, or null when missing.
diff --git a/apps/sim/lib/uploads/providers/s3/client.ts b/apps/sim/lib/uploads/providers/s3/client.ts
index 6f347a4bdd6..f31bd21718d 100644
--- a/apps/sim/lib/uploads/providers/s3/client.ts
+++ b/apps/sim/lib/uploads/providers/s3/client.ts
@@ -3,6 +3,7 @@ import {
   CompleteMultipartUploadCommand,
   CreateMultipartUploadCommand,
   DeleteObjectCommand,
+  DeleteObjectsCommand,
   GetObjectCommand,
   HeadObjectCommand,
   PutObjectCommand,
@@ -10,6 +11,7 @@ import {
   UploadPartCommand,
 } from '@aws-sdk/client-s3'
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
+import { getErrorMessage } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
 import { env } from '@/lib/core/config/env'
 import { S3_CONFIG, S3_KB_CONFIG } from '@/lib/uploads/config'
@@ -251,6 +253,52 @@ export async function deleteFromS3(key: string, customConfig?: S3Config): Promis
   )
 }
 
+/** S3 `DeleteObjects` hard cap. */
+const S3_DELETE_OBJECTS_MAX_KEYS = 1000
+
+/**
+ * Multi-object delete. One HTTP call per 1000 keys; each key still counts
+ * against the per-prefix DELETE rate limit (3500/sec).
+ */
+export async function deleteManyFromS3(
+  keys: string[],
+  customConfig?: S3Config
+): Promise<{ failed: Array<{ key: string; error: string }> }> {
+  const failed: Array<{ key: string; error: string }> = []
+  if (keys.length === 0) return { failed }
+
+  const config = customConfig || { bucket: S3_CONFIG.bucket, region: S3_CONFIG.region }
+  const s3Client = getS3Client()
+
+  for (let i = 0; i < keys.length; i += S3_DELETE_OBJECTS_MAX_KEYS) {
+    const chunk = keys.slice(i, i + S3_DELETE_OBJECTS_MAX_KEYS)
+    try {
+      const response = await s3Client.send(
+        new DeleteObjectsCommand({
+          Bucket: config.bucket,
+          Delete: {
+            Objects: chunk.map((Key) => ({ Key })),
+            Quiet: true,
+          },
+        })
+      )
+      for (const error of response.Errors ?? []) {
+        if (error.Key) {
+          failed.push({
+            key: error.Key,
+            error: error.Message ?? error.Code ?? 'unknown',
+          })
+        }
+      }
+    } catch (error) {
+      const message = getErrorMessage(error)
+      for (const Key of chunk) failed.push({ key: Key, error: message })
+    }
+  }
+
+  return { failed }
+}
+
 /**
  * Initiate a multipart upload for S3
  */

From d73001502267aa69623aead7d2ca2aa7f7ea9bff Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 20 May 2026 23:31:49 -0700
Subject: [PATCH 16/16] perf(mcp): per-server tool cache + surface OAuth start
 errors (#4691)

* fix(mcp): surface authorization-server error instead of generic toast

* perf(mcp): cache tool discovery per-server with test coverage

* refactor(mcp): use SDK's typed OAuthError subclasses for error surfacing

* test(mcp): unit-test surfaceOauthError typed and fallback paths

* chore(mcp): remove unused __where mock export in service.test.ts

* chore(mcp): drop redundant clearCache TSDoc and stray trailing comment

* fix(mcp): don't leak non-OAuth errors; clearCache covers disabled servers

* chore(mcp): tighten clearCache comment to one block
---
 .../sim/app/api/mcp/oauth/start/route.test.ts |  63 ++++-
 apps/sim/app/api/mcp/oauth/start/route.ts     |  40 ++-
 apps/sim/lib/mcp/service.test.ts              | 241 ++++++++++++++++++
 apps/sim/lib/mcp/service.ts                   | 217 +++++++++-------
 4 files changed, 471 insertions(+), 90 deletions(-)
 create mode 100644 apps/sim/lib/mcp/service.test.ts

diff --git a/apps/sim/app/api/mcp/oauth/start/route.test.ts b/apps/sim/app/api/mcp/oauth/start/route.test.ts
index 7c81138ca42..fa8ebf26dc7 100644
--- a/apps/sim/app/api/mcp/oauth/start/route.test.ts
+++ b/apps/sim/app/api/mcp/oauth/start/route.test.ts
@@ -35,7 +35,7 @@ vi.mock('@/lib/auth/hybrid', () => hybridAuthMock)
 vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock)
 vi.mock('@/lib/mcp/oauth', () => mcpOauthMock)
 
-import { GET } from './route'
+import { GET, surfaceOauthError } from './route'
 
 describe('MCP OAuth start route', () => {
   beforeEach(() => {
@@ -134,4 +134,65 @@ describe('MCP OAuth start route', () => {
     expect(body.error).toBe('OAuth authorization already in progress for this server')
     expect(mockMcpAuth).not.toHaveBeenCalled()
   })
+
+  it('does not leak non-OAuth internal error details to the client', async () => {
+    mcpOauthMockFns.mockGetOrCreateOauthRow.mockRejectedValueOnce(
+      new Error('connect ECONNREFUSED 10.0.0.5:5432 (internal-db-host)')
+    )
+    const request = new NextRequest(
+      'http://localhost:3000/api/mcp/oauth/start?workspaceId=workspace-1&serverId=server-1'
+    )
+
+    const response = await GET(request)
+    const body = await response.json()
+
+    expect(response.status).toBe(500)
+    expect(body.error).toBe('Failed to start OAuth flow')
+    expect(body.error).not.toContain('ECONNREFUSED')
+    expect(body.error).not.toContain('internal-db-host')
+  })
+})
+
+describe('surfaceOauthError', () => {
+  it('uses typed OAuthError errorCode and message for spec-compliant errors', async () => {
+    const { InvalidGrantError } = await import('@modelcontextprotocol/sdk/server/auth/errors.js')
+    const err = new InvalidGrantError('Refresh token expired')
+    expect(surfaceOauthError(err)).toBe('invalid_grant: Refresh token expired')
+  })
+
+  it('parses Raw body envelope for ServerError fallbacks (non-spec vendors)', async () => {
+    const { ServerError } = await import('@modelcontextprotocol/sdk/server/auth/errors.js')
+    const err = new ServerError(
+      'HTTP 400: Invalid OAuth error response: zod error. Raw body: {"code":400,"message":"redirect URI https://example.com/cb is not allowed","retryable":false}'
+    )
+    expect(surfaceOauthError(err)).toBe(
+      'Authorization server: redirect URI https://example.com/cb is not allowed'
+    )
+  })
+
+  it('prefers error_description over message over error in fallback envelope', async () => {
+    const { ServerError } = await import('@modelcontextprotocol/sdk/server/auth/errors.js')
+    const err = new ServerError(
+      'HTTP 400: Invalid OAuth error response: zod. Raw body: {"error":"invalid_grant","error_description":"the description","message":"the message"}'
+    )
+    expect(surfaceOauthError(err)).toBe('Authorization server: the description')
+  })
+
+  it('returns first line of generic errors', () => {
+    const err = new Error('Network blip\n  at fetch (...)')
+    expect(surfaceOauthError(err)).toBe('Network blip')
+  })
+
+  it('truncates messages longer than 250 chars with ellipsis', async () => {
+    const { InvalidGrantError } = await import('@modelcontextprotocol/sdk/server/auth/errors.js')
+    const longMessage = 'x'.repeat(300)
+    const result = surfaceOauthError(new InvalidGrantError(longMessage))
+    expect(result.endsWith('…')).toBe(true)
+    expect(result.length).toBe(251)
+  })
+
+  it('returns generic fallback for non-Error values', () => {
+    expect(surfaceOauthError(null)).toBe('Failed to start OAuth flow')
+    expect(surfaceOauthError(undefined)).toBe('Failed to start OAuth flow')
+  })
 })
diff --git a/apps/sim/app/api/mcp/oauth/start/route.ts b/apps/sim/app/api/mcp/oauth/start/route.ts
index 55a7d41956f..c7619b9d555 100644
--- a/apps/sim/app/api/mcp/oauth/start/route.ts
+++ b/apps/sim/app/api/mcp/oauth/start/route.ts
@@ -1,4 +1,5 @@
 import { auth as mcpAuth } from '@modelcontextprotocol/sdk/client/auth.js'
+import { OAuthError, ServerError } from '@modelcontextprotocol/sdk/server/auth/errors.js'
 import { db } from '@sim/db'
 import { mcpServers } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -23,6 +24,39 @@ import { createMcpErrorResponse } from '@/lib/mcp/utils'
 
 const logger = createLogger('McpOauthStartAPI')
 const OAUTH_START_TTL_MS = 10 * 60 * 1000
+const MAX_SURFACED_ERROR_LENGTH = 250
+
+export function surfaceOauthError(error: unknown): string {
+  // Spec-compliant OAuth servers throw typed subclasses with clean RFC 6749 fields.
+  if (error instanceof OAuthError && !(error instanceof ServerError)) {
+    return truncate(`${error.errorCode}: ${error.message}`)
+  }
+
+  // ServerError wraps non-spec response bodies as "HTTP N: Invalid OAuth error
+  // response: ... Raw body: {...}". Dig the vendor message out of the JSON tail.
+  if (error instanceof Error) {
+    const rawBodyMatch = error.message.match(/Raw body:\s*(\{[\s\S]*\})\s*$/)
+    if (rawBodyMatch) {
+      try {
+        const body = JSON.parse(rawBodyMatch[1]) as Record<string, unknown>
+        const vendorMessage =
+          (typeof body.error_description === 'string' && body.error_description) ||
+          (typeof body.message === 'string' && body.message) ||
+          (typeof body.error === 'string' && body.error) ||
+          null
+        if (vendorMessage) return truncate(`Authorization server: ${vendorMessage}`)
+      } catch {}
+    }
+    return truncate(error.message.split('\n')[0] || 'Failed to start OAuth flow')
+  }
+  return 'Failed to start OAuth flow'
+}
+
+function truncate(message: string): string {
+  return message.length > MAX_SURFACED_ERROR_LENGTH
+    ? `${message.slice(0, MAX_SURFACED_ERROR_LENGTH)}…`
+    : message
+}
 
 export const dynamic = 'force-dynamic'
 
@@ -116,7 +150,11 @@ export const GET = withRouteHandler(
       }
     } catch (error) {
       logger.error('Error starting MCP OAuth flow:', error)
-      return createMcpErrorResponse(toError(error), 'Failed to start OAuth flow', 500)
+      // Only surface OAuth-flow errors verbatim; everything else (DB, decryption,
+      // network) gets a generic message to avoid leaking internal details.
+      const userMessage =
+        error instanceof OAuthError ? surfaceOauthError(error) : 'Failed to start OAuth flow'
+      return createMcpErrorResponse(toError(error), userMessage, 500)
     }
   })
 )
diff --git a/apps/sim/lib/mcp/service.test.ts b/apps/sim/lib/mcp/service.test.ts
new file mode 100644
index 00000000000..539ee384579
--- /dev/null
+++ b/apps/sim/lib/mcp/service.test.ts
@@ -0,0 +1,241 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const {
+  MockMcpClient,
+  mockListTools,
+  mockConnect,
+  mockDisconnect,
+  mockGetWorkspaceServersRows,
+  mockResolveEnvVars,
+  mockValidateDomain,
+  mockValidateSsrf,
+  mockIsDomainAllowed,
+} = vi.hoisted(() => {
+  const mockListTools = vi.fn()
+  const mockConnect = vi.fn()
+  const mockDisconnect = vi.fn()
+  return {
+    MockMcpClient: vi.fn().mockImplementation(() => ({
+      connect: mockConnect,
+      disconnect: mockDisconnect,
+      listTools: mockListTools,
+      hasListChangedCapability: vi.fn(() => false),
+      onClose: vi.fn(),
+      getNegotiatedVersion: vi.fn(() => '2025-06-18'),
+    })),
+    mockListTools,
+    mockConnect,
+    mockDisconnect,
+    mockGetWorkspaceServersRows: vi.fn(),
+    mockResolveEnvVars: vi.fn(),
+    mockValidateDomain: vi.fn(),
+    mockValidateSsrf: vi.fn(),
+    mockIsDomainAllowed: vi.fn(() => true),
+  }
+})
+
+vi.mock('@sim/db', () => {
+  const setter = vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue(undefined) })
+  return {
+    db: {
+      select: vi.fn().mockReturnValue({
+        from: vi.fn().mockReturnValue({
+          where: (...args: unknown[]) => mockGetWorkspaceServersRows(...args),
+        }),
+      }),
+      update: vi.fn().mockReturnValue({ set: setter }),
+      insert: vi.fn(),
+      delete: vi.fn(),
+    },
+  }
+})
+
+vi.mock('@/lib/mcp/client', () => ({
+  McpClient: MockMcpClient,
+}))
+
+vi.mock('@/lib/mcp/connection-manager', () => ({
+  mcpConnectionManager: null,
+}))
+
+vi.mock('@/lib/mcp/domain-check', () => ({
+  isMcpDomainAllowed: (...args: unknown[]) => mockIsDomainAllowed(...args),
+  validateMcpDomain: (...args: unknown[]) => mockValidateDomain(...args),
+  validateMcpServerSsrf: (...args: unknown[]) => mockValidateSsrf(...args),
+}))
+
+vi.mock('@/lib/mcp/oauth', () => ({
+  getOrCreateOauthRow: vi.fn(),
+  loadPreregisteredClient: vi.fn(),
+  SimMcpOauthProvider: vi.fn(),
+  withMcpOauthRefreshLock: vi.fn(),
+}))
+
+vi.mock('@/lib/mcp/resolve-config', () => ({
+  resolveMcpConfigEnvVars: (...args: unknown[]) => mockResolveEnvVars(...args),
+}))
+
+import { mcpService } from '@/lib/mcp/service'
+import { McpOauthAuthorizationRequiredError } from '@/lib/mcp/types'
+
+const WORKSPACE_ID = 'workspace-test'
+const USER_ID = 'user-test'
+
+function dbRow(id: string, name: string, overrides: Record<string, unknown> = {}) {
+  return {
+    id,
+    name,
+    description: null,
+    transport: 'streamable-http',
+    url: `https://${id}.example.com/mcp`,
+    authType: 'headers',
+    workspaceId: WORKSPACE_ID,
+    headers: {},
+    timeout: 30000,
+    retries: 3,
+    enabled: true,
+    deletedAt: null,
+    createdAt: new Date('2026-01-01T00:00:00Z'),
+    updatedAt: new Date('2026-01-01T00:00:00Z'),
+    ...overrides,
+  }
+}
+
+function tool(name: string, serverId: string) {
+  return {
+    name,
+    description: name,
+    inputSchema: { type: 'object' },
+    serverId,
+    serverName: serverId,
+  }
+}
+
+describe('McpService.discoverTools per-server caching', () => {
+  beforeEach(async () => {
+    vi.clearAllMocks()
+    mockIsDomainAllowed.mockReturnValue(true)
+    mockValidateSsrf.mockResolvedValue('1.2.3.4')
+    mockValidateDomain.mockImplementation(() => undefined)
+    mockResolveEnvVars.mockImplementation((config: { url: string }) =>
+      Promise.resolve({ config: { ...config, url: config.url }, missingVars: [] })
+    )
+    mockConnect.mockResolvedValue(undefined)
+    mockDisconnect.mockResolvedValue(undefined)
+    // The McpService singleton holds cache state across imports.
+    await mcpService.clearCache()
+  })
+
+  it('caches each server independently after first discovery', async () => {
+    mockGetWorkspaceServersRows.mockResolvedValue([dbRow('mcp-a', 'A'), dbRow('mcp-b', 'B')])
+    mockListTools
+      .mockResolvedValueOnce([tool('a1', 'mcp-a')])
+      .mockResolvedValueOnce([tool('b1', 'mcp-b')])
+
+    const first = await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(first.map((t) => t.name).sort()).toEqual(['a1', 'b1'])
+    expect(mockListTools).toHaveBeenCalledTimes(2)
+
+    mockListTools.mockClear()
+    const second = await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(second.map((t) => t.name).sort()).toEqual(['a1', 'b1'])
+    expect(mockListTools).not.toHaveBeenCalled()
+  })
+
+  it("one server failing does not poison another server's cache", async () => {
+    mockGetWorkspaceServersRows.mockResolvedValue([dbRow('mcp-a', 'A'), dbRow('mcp-b', 'B')])
+    mockListTools
+      .mockResolvedValueOnce([tool('a1', 'mcp-a')])
+      .mockRejectedValueOnce(new Error('Request timed out'))
+
+    const first = await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(first.map((t) => t.name)).toEqual(['a1'])
+
+    mockListTools.mockClear()
+    mockListTools.mockResolvedValueOnce([tool('b1', 'mcp-b')])
+
+    const second = await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(second.map((t) => t.name).sort()).toEqual(['a1', 'b1'])
+    expect(mockListTools).toHaveBeenCalledTimes(1)
+  })
+
+  it("forceRefresh bypasses every server's cache", async () => {
+    mockGetWorkspaceServersRows.mockResolvedValue([dbRow('mcp-a', 'A'), dbRow('mcp-b', 'B')])
+    mockListTools
+      .mockResolvedValueOnce([tool('a1', 'mcp-a')])
+      .mockResolvedValueOnce([tool('b1', 'mcp-b')])
+
+    await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(mockListTools).toHaveBeenCalledTimes(2)
+
+    mockListTools.mockClear()
+    mockListTools
+      .mockResolvedValueOnce([tool('a2', 'mcp-a')])
+      .mockResolvedValueOnce([tool('b2', 'mcp-b')])
+
+    const refreshed = await mcpService.discoverTools(USER_ID, WORKSPACE_ID, true)
+    expect(refreshed.map((t) => t.name).sort()).toEqual(['a2', 'b2'])
+    expect(mockListTools).toHaveBeenCalledTimes(2)
+  })
+
+  it('OAuth-pending is treated as a soft skip without poisoning cache', async () => {
+    mockGetWorkspaceServersRows.mockResolvedValue([dbRow('mcp-a', 'A'), dbRow('mcp-b', 'B')])
+    mockListTools
+      .mockResolvedValueOnce([tool('a1', 'mcp-a')])
+      .mockRejectedValueOnce(new McpOauthAuthorizationRequiredError('mcp-b', 'B'))
+
+    const first = await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(first.map((t) => t.name)).toEqual(['a1'])
+
+    mockListTools.mockClear()
+    mockListTools.mockRejectedValueOnce(new McpOauthAuthorizationRequiredError('mcp-b', 'B'))
+
+    await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(mockListTools).toHaveBeenCalledTimes(1)
+  })
+
+  it('returns empty array immediately when workspace has no servers', async () => {
+    mockGetWorkspaceServersRows.mockResolvedValue([])
+
+    const result = await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(result).toEqual([])
+    expect(mockListTools).not.toHaveBeenCalled()
+    expect(MockMcpClient).not.toHaveBeenCalled()
+  })
+
+  it('clearCache(workspaceId) drops cached tools so next call re-fetches', async () => {
+    mockGetWorkspaceServersRows.mockResolvedValue([dbRow('mcp-a', 'A')])
+    mockListTools.mockResolvedValueOnce([tool('a1', 'mcp-a')])
+
+    await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(mockListTools).toHaveBeenCalledTimes(1)
+
+    await mcpService.clearCache(WORKSPACE_ID)
+
+    mockListTools.mockClear()
+    mockListTools.mockResolvedValueOnce([tool('a1', 'mcp-a')])
+    await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    expect(mockListTools).toHaveBeenCalledTimes(1)
+  })
+
+  it('isolates caches across workspaces', async () => {
+    const otherWorkspaceId = 'workspace-other'
+    mockGetWorkspaceServersRows
+      .mockResolvedValueOnce([dbRow('mcp-a', 'A')])
+      .mockResolvedValueOnce([dbRow('mcp-a', 'A', { workspaceId: otherWorkspaceId })])
+
+    mockListTools
+      .mockResolvedValueOnce([tool('a1', 'mcp-a')])
+      .mockResolvedValueOnce([tool('a-other', 'mcp-a')])
+
+    const first = await mcpService.discoverTools(USER_ID, WORKSPACE_ID)
+    const second = await mcpService.discoverTools(USER_ID, otherWorkspaceId)
+
+    expect(first.map((t) => t.name)).toEqual(['a1'])
+    expect(second.map((t) => t.name)).toEqual(['a-other'])
+    expect(mockListTools).toHaveBeenCalledTimes(2)
+  })
+})
diff --git a/apps/sim/lib/mcp/service.ts b/apps/sim/lib/mcp/service.ts
index 1c3c2fd291a..f3ca6683ae1 100644
--- a/apps/sim/lib/mcp/service.ts
+++ b/apps/sim/lib/mcp/service.ts
@@ -45,6 +45,22 @@ import { MCP_CONSTANTS } from '@/lib/mcp/utils'
 
 const logger = createLogger('McpService')
 
+// Per-server keys so one slow server can't invalidate another's cached tools.
+function serverCacheKey(workspaceId: string, serverId: string): string {
+  return `workspace:${workspaceId}:server:${serverId}`
+}
+
+type DiscoveryOutcome =
+  | { kind: 'cached'; tools: McpTool[] }
+  | {
+      kind: 'fetched'
+      tools: McpTool[]
+      resolvedConfig: McpServerConfig
+      resolvedIP: string | null
+    }
+  | { kind: 'oauth-pending' }
+  | { kind: 'error'; message: string }
+
 class McpService {
   private cacheAdapter: McpCacheStorageAdapter
   private readonly cacheTimeout = MCP_CONSTANTS.CACHE_TIMEOUT
@@ -56,7 +72,11 @@ class McpService {
 
     if (mcpConnectionManager) {
       this.unsubscribeConnectionManager = mcpConnectionManager.subscribe((event) => {
-        this.clearCache(event.workspaceId)
+        this.cacheAdapter
+          .delete(serverCacheKey(event.workspaceId, event.serverId))
+          .catch((err) =>
+            logger.warn(`Failed to invalidate cache for ${event.serverName} on listChanged:`, err)
+          )
       })
     }
   }
@@ -379,20 +399,7 @@ class McpService {
   ): Promise<McpTool[]> {
     const requestId = generateRequestId()
 
-    const cacheKey = `workspace:${workspaceId}`
-
     try {
-      if (!forceRefresh) {
-        try {
-          const cached = await this.cacheAdapter.get(cacheKey)
-          if (cached) {
-            return cached.tools
-          }
-        } catch (error) {
-          logger.warn(`[${requestId}] Cache read failed, proceeding with discovery:`, error)
-        }
-      }
-
       logger.info(`[${requestId}] Discovering MCP tools for workspace ${workspaceId}`)
 
       const servers = await this.getWorkspaceServers(workspaceId)
@@ -402,51 +409,91 @@ class McpService {
         return []
       }
 
-      const allTools: McpTool[] = []
-      const results = await Promise.allSettled(
-        servers.map(async (config) => {
-          const { config: resolvedConfig, resolvedIP } = await this.resolveConfigEnvVars(
-            config,
-            userId,
-            workspaceId
-          )
-          const client = await this.createClient(resolvedConfig, resolvedIP, userId)
+      const outcomes = await Promise.all(
+        servers.map(async (config): Promise<DiscoveryOutcome> => {
+          const cacheKey = serverCacheKey(workspaceId, config.id)
+
+          if (!forceRefresh) {
+            try {
+              const cached = await this.cacheAdapter.get(cacheKey)
+              if (cached) return { kind: 'cached', tools: cached.tools }
+            } catch (error) {
+              logger.warn(
+                `[${requestId}] Cache read failed for ${config.name}, proceeding with discovery:`,
+                error
+              )
+            }
+          }
+
           try {
-            const tools = await client.listTools()
-            logger.debug(
-              `[${requestId}] Discovered ${tools.length} tools from server ${config.name}`
+            const { config: resolvedConfig, resolvedIP } = await this.resolveConfigEnvVars(
+              config,
+              userId,
+              workspaceId
             )
-            return { serverId: config.id, tools, resolvedConfig, resolvedIP }
-          } finally {
-            await client.disconnect()
+            const client = await this.createClient(resolvedConfig, resolvedIP, userId)
+            try {
+              const tools = await client.listTools()
+              logger.debug(
+                `[${requestId}] Discovered ${tools.length} tools from server ${config.name}`
+              )
+              return { kind: 'fetched', tools, resolvedConfig, resolvedIP }
+            } finally {
+              await client.disconnect()
+            }
+          } catch (error) {
+            if (
+              error instanceof McpOauthAuthorizationRequiredError ||
+              error instanceof UnauthorizedError
+            ) {
+              return { kind: 'oauth-pending' }
+            }
+            return { kind: 'error', message: getErrorMessage(error, 'Unknown error') }
           }
         })
       )
 
+      const allTools: McpTool[] = []
+      const cacheWrites: Promise<unknown>[] = []
+      const deferredSideEffects: Promise<unknown>[] = []
+      const liveConnections: Array<{
+        resolvedConfig: McpServerConfig
+        resolvedIP: string | null
+      }> = []
+      let cachedCount = 0
+      let fetchedCount = 0
       let failedCount = 0
-      const statusUpdates: Promise<void>[] = []
 
-      results.forEach((result, index) => {
+      outcomes.forEach((outcome, index) => {
         const server = servers[index]
-        if (result.status === 'fulfilled') {
-          allTools.push(...result.value.tools)
-          statusUpdates.push(
-            this.updateServerStatus(
-              server.id!,
-              workspaceId,
-              true,
-              undefined,
-              result.value.tools.length
-            )
+        if (outcome.kind === 'cached') {
+          cachedCount++
+          allTools.push(...outcome.tools)
+          return
+        }
+        if (outcome.kind === 'fetched') {
+          fetchedCount++
+          allTools.push(...outcome.tools)
+          deferredSideEffects.push(
+            this.updateServerStatus(server.id, workspaceId, true, undefined, outcome.tools.length)
+          )
+          cacheWrites.push(
+            this.cacheAdapter
+              .set(serverCacheKey(workspaceId, server.id), outcome.tools, this.cacheTimeout)
+              .catch((err) =>
+                logger.warn(`[${requestId}] Cache write failed for ${server.name}:`, err)
+              )
           )
-        } else if (
-          result.reason instanceof McpOauthAuthorizationRequiredError ||
-          result.reason instanceof UnauthorizedError
-        ) {
-          // Force 'disconnected' so the settings UI surfaces the re-auth button
-          // instead of a stale 'connected' state when refresh has expired.
+          liveConnections.push({
+            resolvedConfig: outcome.resolvedConfig,
+            resolvedIP: outcome.resolvedIP,
+          })
+          return
+        }
+        if (outcome.kind === 'oauth-pending') {
+          // Mark disconnected so the UI surfaces the re-auth button.
           logger.info(`[${requestId}] Skipping server ${server.name}: OAuth authorization pending`)
-          statusUpdates.push(
+          deferredSideEffects.push(
             db
               .update(mcpServers)
               .set({
@@ -454,55 +501,44 @@ class McpService {
                 lastError: null,
                 updatedAt: new Date(),
               })
-              .where(eq(mcpServers.id, server.id!))
+              .where(eq(mcpServers.id, server.id))
               .then(() => undefined)
               .catch((err) => {
                 logger.warn(`[${requestId}] Failed to mark server ${server.id} disconnected:`, err)
               })
           )
-        } else {
-          failedCount++
-          const errorMessage = getErrorMessage(result.reason, 'Unknown error')
-          logger.warn(`[${requestId}] Failed to discover tools from server ${server.name}:`)
-          statusUpdates.push(this.updateServerStatus(server.id!, workspaceId, false, errorMessage))
+          return
         }
+        failedCount++
+        logger.warn(
+          `[${requestId}] Failed to discover tools from server ${server.name}: ${outcome.message}`
+        )
+        deferredSideEffects.push(
+          this.updateServerStatus(server.id, workspaceId, false, outcome.message)
+        )
       })
 
-      Promise.allSettled(statusUpdates).catch((err) => {
-        logger.error(`[${requestId}] Error updating server statuses:`, err)
+      // Await cache writes so a follow-up discoverTools sees consistent state.
+      await Promise.allSettled(cacheWrites)
+      Promise.allSettled(deferredSideEffects).catch((err) => {
+        logger.error(`[${requestId}] Error in deferred discovery work:`, err)
       })
 
-      // Fire-and-forget persistent connections for servers that support listChanged
       if (mcpConnectionManager) {
-        for (const [index, result] of results.entries()) {
-          if (result.status === 'fulfilled') {
-            const { resolvedConfig, resolvedIP } = result.value
-            mcpConnectionManager
-              .connect(resolvedConfig, userId, workspaceId, resolvedIP)
-              .catch((err) => {
-                logger.warn(
-                  `[${requestId}] Persistent connection failed for ${servers[index].name}:`,
-                  err
-                )
-              })
-          }
-        }
-      }
-
-      if (failedCount === 0) {
-        try {
-          await this.cacheAdapter.set(cacheKey, allTools, this.cacheTimeout)
-        } catch (error) {
-          logger.warn(`[${requestId}] Cache write failed:`, error)
+        for (const conn of liveConnections) {
+          mcpConnectionManager
+            .connect(conn.resolvedConfig, userId, workspaceId, conn.resolvedIP)
+            .catch((err) => {
+              logger.warn(
+                `[${requestId}] Persistent connection failed for ${conn.resolvedConfig.name}:`,
+                err
+              )
+            })
         }
-      } else {
-        logger.warn(
-          `[${requestId}] Skipping cache due to ${failedCount} failed server(s) - will retry on next request`
-        )
       }
 
       logger.info(
-        `[${requestId}] Discovered ${allTools.length} tools from ${servers.length - failedCount}/${servers.length} servers`
+        `[${requestId}] Discovered ${allTools.length} tools from ${servers.length} servers (cached=${cachedCount} fetched=${fetchedCount} failed=${failedCount})`
       )
       return allTools
     } catch (error) {
@@ -634,15 +670,20 @@ class McpService {
     }
   }
 
-  /**
-   * Clear tool cache for a workspace or all workspaces
-   */
   async clearCache(workspaceId?: string): Promise<void> {
     try {
       if (workspaceId) {
-        const workspaceCacheKey = `workspace:${workspaceId}`
-        await this.cacheAdapter.delete(workspaceCacheKey)
-        logger.debug(`Cleared MCP tool cache for workspace ${workspaceId}`)
+        // No enabled/deletedAt filter so disabled and soft-deleted rows are
+        // cleared too. Hard-deleted rows are gone from the table; their keys
+        // expire via TTL.
+        const rows = await db
+          .select({ id: mcpServers.id })
+          .from(mcpServers)
+          .where(eq(mcpServers.workspaceId, workspaceId))
+        await Promise.allSettled(
+          rows.map((r) => this.cacheAdapter.delete(serverCacheKey(workspaceId, r.id)))
+        )
+        logger.debug(`Cleared MCP tool cache for workspace ${workspaceId} (${rows.length} servers)`)
       } else {
         await this.cacheAdapter.clear()
         logger.debug('Cleared all MCP tool cache')